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

Change-Id: I6a1b25f72618d1b521e1044334e4d5ad1f9a45b0