Reconcile with jb-mr2-release - do not merge

Change-Id: Ie2c8eed6e2ee90bc1d1a59184a503f9dd0dcdc80