Reconcile with jb-mr2-release - do not merge

Change-Id: Ib99b7cd6aede63006c91be2635112e16dd0f2b24