Reconcile with jb-mr2-release - do not merge

Change-Id: Iba77657b25f0d8702cdf25b00ceafd2b639fe10b