Merge "Add ConnectivityService owner"