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

* commit 'a4d8f804688deb939a37e5aaf0bab40520548b33':