Merge "Change ThreadsTest to use CyclicBarrier to address flakiness"