am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c09444eb5b66a5702db99d9b7de23cb73bf11aa4':