Merge "Fix the race condition for b/11458382"