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

Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2