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

Change-Id: Ia73ebcebfb83a21442a31dc7280763484e47534c