Reconcile with jb-mr0-release jb-release

Change-Id: If3342704edc69195c0ffc4648f3720990bc9bb3a