Merge "Support setting primary provider" into udc-dev