Reconcile with jb-mr2-release - do not merge

Change-Id: Ibb0717548e31119f78d4ba6c2474ef53f701d409