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

Change-Id: I3cbf27926ade31d0d902d69900c44453c678c40d