am a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'a108106eb489a5e2b657d0afc63872334ba0f791':