am ce8ffda0: am aeec25da: Reconcile with jb-mr0-release

* commit 'ce8ffda06397f4a3f8c75f8e2c41f8883625e4f3':