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

Change-Id: If5c61e6612ce4b804c7882afb5241cc03b1bd617