Reconcile with jb-mr2-release - do not merge

Change-Id: I5ea4651068ddbac4e42244bd638b8cce98f03be2