Reconcile with jb-mr2-release - do not merge

Change-Id: I2635d0c79d4adc135c7f0b6345547ed5e3114158