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

* commit '582299dd46465c5cd932783116c83504a852650f':