am e3618dce: Reconcile with jb-mr1-release

* commit 'e3618dce22a0ce18c181f33b71213502ac7346db':