Fixing security vuln by tightening race condition window. am: e92a8975f4
am: be5b449337  -s ours

Change-Id: I53d1b6f49c034d8209dfc9a1969573e707c8533d