Merge "set connection state after adding NonSimulatorConnectionListener and...
Merge "set connection state after adding NonSimulatorConnectionListener and set connection to active at the end." am: ac3d0e58
am: 2b310bbf
Change-Id: I1b5aad804450606b4453cd3c7ec7071fcd8cc585