am c6102390: am 209cdc3b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'c6102390c6f2f7228326913e4d2e7598fbdd596a':