Merge "Set the primary provider list to UI" into udc-dev