am a90af045: am 905272a4: am 8f21770c: am dc7d4627: am 2606fc48: Reconcile with jb-mr0-release jb-release

* commit 'a90af045a4523c2a61a6795d15d8cfdf4c0f3821':