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

Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec