Reconcile with jb-mr2-release - do not merge

Change-Id: I39818a4cb4091b11e4f76bf8a4e46cc863cceaf1