Reconcile with jb-mr2-release - do not merge

Change-Id: I49fd5e4403bfbd598174527115887dd252dcf17a