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

Change-Id: I55fb35955c4a36d9b3803cd709046b03ae8de566