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

Change-Id: Ic45c05e30f974890e8c5320393f95adaf0d0a79f