am aeec25da: Reconcile with jb-mr0-release

* commit 'aeec25dabd57ec39208b7e3adefab649e51b86e0':