am 192690b8: am 992df2fa: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '192690b863a912fb1c1e7a7620ad6915933f9662':