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

Change-Id: I650c2594940e3e33e8824254a6204feb1439038e