Reconcile with jb-mr2-release - do not merge

Change-Id: I3f5d93933ed9f81cf746411ce6c2b2aad7404b1b