Merge "Change the DiscoveryProviderManager to use the Multiplexer logic" into udc-dev