Merge "Add helper class for RpcError interface"