am d2f41fe2: Merge "Fix ConcurrentCloseTest flakiness."

* commit 'd2f41fe210bf0fe958345f84e95e8f037c325005':
  Fix ConcurrentCloseTest flakiness.