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

Change-Id: I919b0c56af88eb60f2a3c055e6b99350b644cf26