Merge "Hang up original swapped connection" into oc-dr1-dev
am: 3f5ca60758

Change-Id: I019bb488c7dee6404c09751824194d2037068e1c