am 3e956208: am 062347a0: am 115b146c: Reconcile with jb-mr0-release jb-release

* commit '3e956208e08b54792209a38bd4e3a01f8fe64109':