Merge "Made sync-test actually wait for first thread to start."