Reconcile with jb-mr0-release jb-release

Change-Id: I0249d315e647dcdc2f3dea4d258ef5bf2065731d