Reconcile with jb-mr0-release - do not merge

Change-Id: Ia744536ee9da563e661fdcd84defb22720d76309