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

Change-Id: I57860c6fcecf38f0f25f27c533f78b93c2b5f810