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

* commit '07c8a6d238ddf855d5d6b4421d2527c580a374b6':