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

* commit '76572c63b8615b55a7883dcf40024653436be4c9':