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

* commit 'bdcf82513c64690ee0de6a791fdf07b005ebd43d':