[automerger skipped] Merge "Correctly Destroy a Connection when there is an Error" am: d089f39f9d  -s ours
am: c07f65727c  -s ours

Change-Id: Ic324c9f94bb052f894433f89a1803ff9fac0cb22