Merge "Add ConnectivityServiceIntegrationTest" am: 324d724f am: ef8268d3 am: c7e7bb21 am: fa0b3b5e am: ed1822cc Change-Id: I3c0f04c142b1b4d1c072d0ade56c6c528dc6807a