Reconcile with jb-mr0-release jb-release

Change-Id: I3742aff353335629ae76eacc2d92a6aed87b1ebe