am d8df6f30: Reconcile with jb-mr0-release

* commit 'd8df6f30a06a1cb4dcc92943b73ce2d60d8a75bc':