Merge "Add cause and errorType to RpcError"