Fix the race condition for b/11458382

Change-Id: I862da57a70283a2afd5d67751aec87fb808760d2
1 file changed