Merge "Work around ServerSocketConcurrentCloseTest flakiness am: bbea315f53  -s ours"