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

Change-Id: I02e004028811a3efad8c010ed19e216bb87814d7