am b5815b0a: Reconcile with jb-mr0-release

* commit 'b5815b0afbc140c86baaeffec3eae359f11a1894':