Merge "Fixed remove rpc api in rpc registry"