Merge "Hang up original swapped connection" am: 2b9a60d29c am: 01559af1aa am: 4bdcbd7cb3  -s ours am: ca3ef82b59  -s ours
am: cc7ee9a798  -s ours

Change-Id: Iaf507cde148cfa2127d1827279c0e4d3d1844eeb