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

* commit 'f40b247f6602b4f660c41b3850a2466696bf9073':