Merge "Avoid race in OSWaitCondition test" into mcp/pike