am b843601a: am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b843601a9de78a0015c8d963187efaa530e46d46':