Reconcile with jb-mr2-release - do not merge

Change-Id: I7f22b8b492120139d4a56684d5b5e9ef5094019e