Merge "Revert "Fixing security vuln by tightening race condition window."" am: fbe01199cb am: 7664a53479 am: fc325ddb46

Change-Id: I03857fe48f7ac3a9b52f7dfcd7bd330d7406f094