Fixing security vuln by tightening race condition window. am: 05fbbe5f3d
am: 4368fdbae1  -s ours

Change-Id: Id29824c9f758ed5c890ced45ffd057395018c694