Reconcile with jb-mr2-release - do not merge

Change-Id: Ica8969ad3d63f92950481e984bfafc2b978cfda2