am 75572338: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '75572338db212bca2c9f0a63fa1f943a5f0cdb5f':