Reconcile with jb-mr2-release - do not merge

Change-Id: I8176eb9302e58477ef1bd9b394a974d85fa67792