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

* commit '16f00894d5cc48d0814cc5d061e8373cbb514389':