Merge "Support disconnecting while trying to connect." am: 57a0aba819

Original change: undetermined

Change-Id: I2c6523aa5b353501f09715992db9150a8a077443