am 115b146c: Reconcile with jb-mr0-release jb-release

* commit '115b146cc2dc4b4f9d43b4cd761727d233fc297c':