am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '5535a9e9806775dd09279e9fe415565ced30f3ae':