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

* commit 'c2203765ea773939cc1a3fe3a77d887c91d0719b':