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

Change-Id: I403a5c4ff9d3c042699f0cabf51ed170c7faa7da