Merge "Do not return null when no RPC is registered"