Reconcile with jb-mr2-release - do not merge

Change-Id: I3cb51e82df9bd0f75f5a00820a6f71ddb23734bf