am ec4147ed: Reconcile with jb-mr0-release

* commit 'ec4147ed136546f0be29a68d8edbdafbcf656e58':