Merge "Improve RpcProviderRegistry loading"