Merge "Move ConnectivityResources to service-connectivity"