am d925573a: (-s ours) Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev am: 2bd5d2d8f1

Original change: undetermined

Change-Id: Ibcf9c9a84f387844d09171edee4d2eb37fa0b685