Merge "Add ConnectivityServiceIntegrationTest" am: 324d724fd7 am: ef8268d3b0 am: c7e7bb213c am: fa0b3b5edd
am: ed1822ccb7

Change-Id: I3c0f04c142b1b4d1c072d0ade56c6c528dc6807a