am dd6165c7: am 2b60db0e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'dd6165c7e53c3a6b48a53f8c3f1d518cb631111d':