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

* commit '365ce897f96915c2a303dbfe85937ecb395a7a1d':