Merge "Add tests for SharedConnectivityService" into udc-dev