am 0befd545: am e6b059a9: am 2fa4d0ef: am 9067a62a: (-s ours) am de97f9c2: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0befd54572d410898c82f57f7698f3b9244bd627':