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

* commit 'a8540f2ae3b75e41192c49472959d141122dc5f9':