Reconcile with jb-mr2-release - do not merge

Change-Id: I90d8d0cd290854e97f9919ef58bda3ca9ac3fd07