Reconcile with jb-mr2-release - do not merge

Change-Id: I970d252d812e6184c224c0e6e62f32817059f6d8