Reconcile with jb-mr0-release jb-release

Change-Id: Ic2ec5b153ef7247ed83e6939e71a5222f6c5dd31