Fixing security vuln by tightening race condition window.
am: e92a8975f4

Change-Id: I1fb05a0ab32c3fab839fd3c0364f1b3fbc06e8ab