Merge "Add a test to make sure transition from CONNECTING to DISCONNECTED is handled."