Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I2c24ec07adc57969cc48647a07afca7337923d51