Reconcile with jb-mr2-release - do not merge

Change-Id: I4e1415d265b543bcfb24dc7b520162fee1f48806