am 38beb759: Reconcile with jb-mr0-release

* commit '38beb75989f517071635750d26ae5b34ee8b4a84':