am f072e3d2: (-s ours) am a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f072e3d20531ca452a51bd45f863abb23f2e3968':