Merge "Correctly Destroy a Connection when there is an Error" into pi-dev am: 2dad1301d6
am: d064f09828

Change-Id: Iceabb7ef9a44a7016258bd5533206a35519d200b