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

* commit '8359c2138a4e6bad5340cc3d17160aa035f185b4':