am ba70ed9a: Reconcile with jb-mr1-release - do not merge

* commit 'ba70ed9ae7dab75bde317a8dc8886da309831eca':