Merge "Use a synchronization barrier to fix flakes."