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

Change-Id: Ia790fab495bbf38aeb390343c0d45f447480d661