am b2734edb: am 779f058c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'b2734edb5022d69bec22b249f09aabe3f9215a50':