DO NOT MERGE Temporary fix for race condition.

Bug: 303078360
Test: Manual

Change-Id: I7355e3b64424492b6fab4f416014d2a9a797973d
1 file changed