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

Change-Id: Ic12c6d871c687e524a8cf4cede01b8e736b8431a