Merge "Avoid race in OSWaitCondition test"