am b5beb2b3: (-s ours) am af11e9a6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b5beb2b3d7c808aee25dfa3f87918438df69f4f5':