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

* commit '55d176e66934371b24a448a145bc0d2b64ea470d':