Merge "set connection state after adding NonSimulatorConnectionListener and set connection to active at the end." am: ac3d0e58f1
am: 2b310bbf73

Change-Id: I1b5aad804450606b4453cd3c7ec7071fcd8cc585