Reconcile with jb-mr2-release - do not merge

Change-Id: I1b72e802b0ea0288d030d54011a9af97e3cdd5fd