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

* commit '9f9d5bfe8673a6e7274ae50222bd09c623205d59':