Fixing security vuln by tightening race condition window.
am: 05fbbe5f3d

Change-Id: I478f16ab9a29ca9a2b23a654474302a3c52f0433