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

* commit '4a2e54c7642d97873cc9f0d6c4387a0b0aa5a697':