am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge

* commit '62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d':