Merge "Add service link when no providers are present" into udc-dev