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

Change-Id: Ifad3c64944cd9f52bc376d45c5bd87bc23a28742