Reconcile with jb-mr1-release - do not merge

Change-Id: I3660c9875037e7074623adeeeada1ff476413013