Merge "Cleanup connection destruction to avoid ConcurrentModificationException."
am: d675d5c150

Change-Id: I71638ff37ca4a63d87df3f4be595a688c5afb49d