am 92c5ddcb: am baf8ef51: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '92c5ddcbe6d79fb8609b6b13eb56b4c5da43f07d':