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

* commit '9a7768a4f3fede135ab73098d6a2ae046b5d016b':