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

Change-Id: I757f3e2fff4dc23cb09a3a685d7a482c49874457