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

* commit 'a12b114c705f8e1c70b83aa354bae00b6ac09f63':