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

Change-Id: I8a1c9c4b0a3730977c0a34fcd55d41f84999b485