am 1a377cba: Reconcile with jb-mr0-release

* commit '1a377cbaafba4e60d8408d83b9444a1a8f5caa7f':