Reconcile with jb-mr0-release jb-release

Change-Id: I4a3e1815d4b0b12ace6ee6fc9e3c1711f3edcf63