Merge "Add ConnectivityService owner" into rvc-dev