am f3c5b01d: Reconcile with jb-mr0-release jb-release

* commit 'f3c5b01d6d1a1a3ca1b2df4032849948a60bcbc4':