Merge "Fix ConcurrentCloseTest flakiness."