Merge "RpcServer: Don't shadow local var"