Merge github.com:grpc/grpc into tis-but-thy-name

Conflicts:
	test/core/end2end/tests/request_with_flags.c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/transport/transport.c b/src/core/transport/transport.c
index 1397e21933..fe565944ed 100644
--- a/src/core/transport/transport.c
+++ b/src/core/transport/transport.c
@@ -83,8 +83,8 @@ void grpc_transport_stream_op_add_cancellation(grpc_transport_stream_op *op,
                                                grpc_mdstr *message) {
   if (op->cancel_with_status == GRPC_STATUS_OK) {
     op->cancel_with_status = status;
-    op->cancel_message = message;
-  } else if (message) {
+  }
+  if (message) {
     grpc_mdstr_unref(message);
   }
 }