Merge "Support disconnecting while trying to connect." am: 0741b352db

Original change: undetermined

Change-Id: I3b4c733246eade2e20ad77905261e9fbb98e3c9c