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

* commit 'af11e9a60b569ce2d9655648356ea32d0d9a375d':