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

Change-Id: Ifabc6325c7c832b018cfca775680e3e90fc99832