Merge "Add ConnectivityServiceIntegrationTest"