diff --git a/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c b/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
index 1f53e581abd0d461cc4f03df22283312cf2c3e3d..b15a18f1a7331ccd3ffd7ff9604b9947d12fe445 100644
--- a/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
+++ b/test/core/end2end/fixtures/chttp2_socket_pair_with_grpc_trace.c
@@ -63,7 +63,8 @@ static grpc_transport_setup_result server_setup_transport(
   static grpc_channel_filter const *extra_filters[] = {
       &grpc_http_server_filter};
   return grpc_server_setup_transport(f->server, transport, extra_filters,
-                                     GPR_ARRAY_SIZE(extra_filters), mdctx);
+                                     GPR_ARRAY_SIZE(extra_filters), mdctx,
+                                     grpc_server_get_channel_args(f->server));
 }
 
 typedef struct {
diff --git a/third_party/protobuf b/third_party/protobuf
index a8b38c598d7f65b281a72809b28117afdb760931..644a6a1da71385e9d7a7a26b3476c93fdd71788c 160000
--- a/third_party/protobuf
+++ b/third_party/protobuf
@@ -1 +1 @@
-Subproject commit a8b38c598d7f65b281a72809b28117afdb760931
+Subproject commit 644a6a1da71385e9d7a7a26b3476c93fdd71788c