Merge "Hang up original swapped connection"
am: 2b9a60d29c

Change-Id: I28fbd7a39a50ecae11d1d8749939ba69ce136cde