Reconcile with jb-mr0-release - do not merge

Change-Id: I1b32782f70c67a734c37b34cf31b97103cf9e23b