diff --git a/CMakeLists.txt b/CMakeLists.txt
index 928d2c68e9e..d9819760c0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@
 
 
 
+
 cmake_minimum_required(VERSION 3.5.1)
 
 set(PACKAGE_NAME          "grpc")
@@ -250,6 +251,82 @@ add_custom_target(tools_cxx
 add_custom_target(tools
   DEPENDS tools_c tools_cxx)
 
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/channelz/channelz.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/core/stats.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/health/v1/health.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/lb/v1/load_balancer.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/reflection/v1alpha/reflection.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/status/status.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/benchmark_service.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/compiler_test.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/control.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/duplicate/echo_duplicate.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/echo.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/echo_messages.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/empty.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/messages.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/metrics.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/payloads.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/report_qps_scenario_service.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/simple_messages.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/stats.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/test.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/worker_service.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/xds/ads_for_test.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/xds/eds_for_test.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/xds/lrs_for_test.proto
+)
+protobuf_generate_grpc_cpp(
+  src/proto/grpc/testing/xds/orca_load_report_for_test.proto
+)
+
 if (gRPC_BUILD_TESTS)
 add_custom_target(buildtests_c)
 add_dependencies(buildtests_c algorithm_test)
@@ -790,7 +867,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(address_sorting
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -843,7 +919,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(alts_test_util
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -926,7 +1001,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(gpr
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -1397,7 +1471,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -1817,7 +1890,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc_cronet
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -2173,7 +2245,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc_test_util
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -2526,7 +2597,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc_test_util_unsecure
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -2921,7 +2991,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc_unsecure
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3023,7 +3092,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(reconnect_server
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3070,7 +3138,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(test_tcp_server
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3122,10 +3189,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo.proto
-)
-
 target_include_directories(bm_callback_test_service_impl
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3184,7 +3247,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(dns_test_util
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3285,7 +3347,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc++
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3617,10 +3678,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/core/stats.proto
-)
-
 target_include_directories(grpc++_core_stats
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3676,10 +3733,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/status/status.proto
-)
-
 target_include_directories(grpc++_error_details
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3753,10 +3806,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/reflection/v1alpha/reflection.proto
-)
-
 target_include_directories(grpc++_proto_reflection_desc_db
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3824,10 +3873,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/reflection/v1alpha/reflection.proto
-)
-
 target_include_directories(grpc++_reflection
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3896,7 +3941,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc++_test_config
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -3980,25 +4024,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/channelz/channelz.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/health/v1/health.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo_messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/duplicate/echo_duplicate.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/simple_messages.proto
-)
-
 target_include_directories(grpc++_test_util
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -4198,22 +4223,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/health/v1/health.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo_messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/duplicate/echo_duplicate.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/simple_messages.proto
-)
-
 target_include_directories(grpc++_test_util_unsecure
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -4430,7 +4439,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc++_unsecure
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -4750,7 +4758,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc_benchmark
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -4813,10 +4820,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/reflection/v1alpha/reflection.proto
-)
-
 target_include_directories(grpc_cli_libs
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -4885,7 +4888,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc_plugin_support
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -4954,10 +4956,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/channelz/channelz.proto
-)
-
 target_include_directories(grpcpp_channelz
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5038,16 +5036,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/empty.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/test.proto
-)
-
 target_include_directories(http2_client_main
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5108,10 +5096,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-
 target_include_directories(interop_client_helper
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5181,16 +5165,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/empty.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/test.proto
-)
-
 target_include_directories(interop_client_main
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5248,7 +5222,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(interop_server_helper
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5316,16 +5289,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/empty.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/test.proto
-)
-
 target_include_directories(interop_server_lib
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5383,7 +5346,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(interop_server_main
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5475,28 +5437,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/payloads.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/stats.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/control.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/benchmark_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/report_qps_scenario_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/worker_service.proto
-)
-
 target_include_directories(qps
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5552,7 +5492,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(grpc_csharp_ext
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5606,7 +5545,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(bad_client_test
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5659,7 +5597,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(bad_ssl_test_server
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5784,7 +5721,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(end2end_tests
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5909,7 +5845,6 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-
 target_include_directories(end2end_nosec_tests
   PUBLIC $<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -5940,7 +5875,6 @@ add_executable(algorithm_test
   test/core/compression/algorithm_test.cc
 )
 
-
 target_include_directories(algorithm_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -5971,7 +5905,6 @@ add_executable(alloc_test
   test/core/gpr/alloc_test.cc
 )
 
-
 target_include_directories(alloc_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6002,7 +5935,6 @@ add_executable(alpn_test
   test/core/transport/chttp2/alpn_test.cc
 )
 
-
 target_include_directories(alpn_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6033,7 +5965,6 @@ add_executable(arena_test
   test/core/gpr/arena_test.cc
 )
 
-
 target_include_directories(arena_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6064,7 +5995,6 @@ add_executable(avl_test
   test/core/avl/avl_test.cc
 )
 
-
 target_include_directories(avl_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6095,7 +6025,6 @@ add_executable(bad_server_response_test
   test/core/end2end/bad_server_response_test.cc
 )
 
-
 target_include_directories(bad_server_response_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6127,7 +6056,6 @@ add_executable(bin_decoder_test
   test/core/transport/chttp2/bin_decoder_test.cc
 )
 
-
 target_include_directories(bin_decoder_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6157,7 +6085,6 @@ add_executable(bin_encoder_test
   test/core/transport/chttp2/bin_encoder_test.cc
 )
 
-
 target_include_directories(bin_encoder_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6188,7 +6115,6 @@ add_executable(buffer_list_test
   test/core/iomgr/buffer_list_test.cc
 )
 
-
 target_include_directories(buffer_list_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6220,7 +6146,6 @@ add_executable(channel_create_test
   test/core/surface/channel_create_test.cc
 )
 
-
 target_include_directories(channel_create_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6250,7 +6175,6 @@ add_executable(check_epollexclusive
   test/build/check_epollexclusive.c
 )
 
-
 target_include_directories(check_epollexclusive
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6279,7 +6203,6 @@ add_executable(chttp2_hpack_encoder_test
   test/core/transport/chttp2/hpack_encoder_test.cc
 )
 
-
 target_include_directories(chttp2_hpack_encoder_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6310,7 +6233,6 @@ add_executable(chttp2_stream_map_test
   test/core/transport/chttp2/stream_map_test.cc
 )
 
-
 target_include_directories(chttp2_stream_map_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6341,7 +6263,6 @@ add_executable(chttp2_varint_test
   test/core/transport/chttp2/varint_test.cc
 )
 
-
 target_include_directories(chttp2_varint_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6373,7 +6294,6 @@ add_executable(close_fd_test
   test/core/bad_connection/close_fd_test.cc
 )
 
-
 target_include_directories(close_fd_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6405,7 +6325,6 @@ add_executable(cmdline_test
   test/core/util/cmdline_test.cc
 )
 
-
 target_include_directories(cmdline_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6436,7 +6355,6 @@ add_executable(combiner_test
   test/core/iomgr/combiner_test.cc
 )
 
-
 target_include_directories(combiner_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6467,7 +6385,6 @@ add_executable(compression_test
   test/core/compression/compression_test.cc
 )
 
-
 target_include_directories(compression_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6498,7 +6415,6 @@ add_executable(concurrent_connectivity_test
   test/core/surface/concurrent_connectivity_test.cc
 )
 
-
 target_include_directories(concurrent_connectivity_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6529,7 +6445,6 @@ add_executable(connection_refused_test
   test/core/end2end/connection_refused_test.cc
 )
 
-
 target_include_directories(connection_refused_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6560,7 +6475,6 @@ add_executable(dns_resolver_connectivity_test
   test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc
 )
 
-
 target_include_directories(dns_resolver_connectivity_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6591,7 +6505,6 @@ add_executable(dns_resolver_cooldown_using_ares_resolver_test
   test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
 )
 
-
 target_include_directories(dns_resolver_cooldown_using_ares_resolver_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6622,7 +6535,6 @@ add_executable(dns_resolver_cooldown_using_native_resolver_test
   test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc
 )
 
-
 target_include_directories(dns_resolver_cooldown_using_native_resolver_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6653,7 +6565,6 @@ add_executable(dns_resolver_test
   test/core/client_channel/resolvers/dns_resolver_test.cc
 )
 
-
 target_include_directories(dns_resolver_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6685,7 +6596,6 @@ add_executable(dualstack_socket_test
   test/core/end2end/dualstack_socket_test.cc
 )
 
-
 target_include_directories(dualstack_socket_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6717,7 +6627,6 @@ add_executable(endpoint_pair_test
   test/core/iomgr/endpoint_pair_test.cc
 )
 
-
 target_include_directories(endpoint_pair_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6748,7 +6657,6 @@ add_executable(error_test
   test/core/iomgr/error_test.cc
 )
 
-
 target_include_directories(error_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6780,7 +6688,6 @@ add_executable(ev_epollex_linux_test
   test/core/iomgr/ev_epollex_linux_test.cc
 )
 
-
 target_include_directories(ev_epollex_linux_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6812,7 +6719,6 @@ add_executable(fake_resolver_test
   test/core/client_channel/resolvers/fake_resolver_test.cc
 )
 
-
 target_include_directories(fake_resolver_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6845,7 +6751,6 @@ add_executable(fake_transport_security_test
   test/core/tsi/transport_security_test_lib.cc
 )
 
-
 target_include_directories(fake_transport_security_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6878,7 +6783,6 @@ add_executable(fd_conservation_posix_test
   test/core/iomgr/fd_conservation_posix_test.cc
 )
 
-
 target_include_directories(fd_conservation_posix_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6911,7 +6815,6 @@ add_executable(fd_posix_test
   test/core/iomgr/fd_posix_test.cc
 )
 
-
 target_include_directories(fd_posix_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6943,7 +6846,6 @@ add_executable(fling_client
   test/core/fling/client.cc
 )
 
-
 target_include_directories(fling_client
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -6974,7 +6876,6 @@ add_executable(fling_server
   test/core/fling/server.cc
 )
 
-
 target_include_directories(fling_server
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7006,7 +6907,6 @@ add_executable(fling_stream_test
   test/core/fling/fling_stream_test.cc
 )
 
-
 target_include_directories(fling_stream_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7039,7 +6939,6 @@ add_executable(fling_test
   test/core/fling/fling_test.cc
 )
 
-
 target_include_directories(fling_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7072,7 +6971,6 @@ add_executable(fork_test
   test/core/gprpp/fork_test.cc
 )
 
-
 target_include_directories(fork_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7105,7 +7003,6 @@ add_executable(goaway_server_test
   test/core/end2end/goaway_server_test.cc
 )
 
-
 target_include_directories(goaway_server_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7137,7 +7034,6 @@ add_executable(gpr_cpu_test
   test/core/gpr/cpu_test.cc
 )
 
-
 target_include_directories(gpr_cpu_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7168,7 +7064,6 @@ add_executable(gpr_env_test
   test/core/gpr/env_test.cc
 )
 
-
 target_include_directories(gpr_env_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7199,7 +7094,6 @@ add_executable(gpr_host_port_test
   test/core/gprpp/host_port_test.cc
 )
 
-
 target_include_directories(gpr_host_port_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7230,7 +7124,6 @@ add_executable(gpr_log_test
   test/core/gpr/log_test.cc
 )
 
-
 target_include_directories(gpr_log_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7261,7 +7154,6 @@ add_executable(gpr_manual_constructor_test
   test/core/gprpp/manual_constructor_test.cc
 )
 
-
 target_include_directories(gpr_manual_constructor_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7292,7 +7184,6 @@ add_executable(gpr_spinlock_test
   test/core/gpr/spinlock_test.cc
 )
 
-
 target_include_directories(gpr_spinlock_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7323,7 +7214,6 @@ add_executable(gpr_string_test
   test/core/gpr/string_test.cc
 )
 
-
 target_include_directories(gpr_string_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7354,7 +7244,6 @@ add_executable(gpr_sync_test
   test/core/gpr/sync_test.cc
 )
 
-
 target_include_directories(gpr_sync_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7385,7 +7274,6 @@ add_executable(gpr_thd_test
   test/core/gprpp/thd_test.cc
 )
 
-
 target_include_directories(gpr_thd_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7416,7 +7304,6 @@ add_executable(gpr_time_test
   test/core/gpr/time_test.cc
 )
 
-
 target_include_directories(gpr_time_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7447,7 +7334,6 @@ add_executable(gpr_tls_test
   test/core/gpr/tls_test.cc
 )
 
-
 target_include_directories(gpr_tls_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7478,7 +7364,6 @@ add_executable(gpr_useful_test
   test/core/gpr/useful_test.cc
 )
 
-
 target_include_directories(gpr_useful_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7509,7 +7394,6 @@ add_executable(grpc_auth_context_test
   test/core/security/auth_context_test.cc
 )
 
-
 target_include_directories(grpc_auth_context_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7540,7 +7424,6 @@ add_executable(grpc_b64_test
   test/core/slice/b64_test.cc
 )
 
-
 target_include_directories(grpc_b64_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7571,7 +7454,6 @@ add_executable(grpc_byte_buffer_reader_test
   test/core/surface/byte_buffer_reader_test.cc
 )
 
-
 target_include_directories(grpc_byte_buffer_reader_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7602,7 +7484,6 @@ add_executable(grpc_channel_args_test
   test/core/channel/channel_args_test.cc
 )
 
-
 target_include_directories(grpc_channel_args_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7633,7 +7514,6 @@ add_executable(grpc_channel_stack_builder_test
   test/core/channel/channel_stack_builder_test.cc
 )
 
-
 target_include_directories(grpc_channel_stack_builder_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7664,7 +7544,6 @@ add_executable(grpc_channel_stack_test
   test/core/channel/channel_stack_test.cc
 )
 
-
 target_include_directories(grpc_channel_stack_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7695,7 +7574,6 @@ add_executable(grpc_completion_queue_test
   test/core/surface/completion_queue_test.cc
 )
 
-
 target_include_directories(grpc_completion_queue_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7726,7 +7604,6 @@ add_executable(grpc_completion_queue_threading_test
   test/core/surface/completion_queue_threading_test.cc
 )
 
-
 target_include_directories(grpc_completion_queue_threading_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7757,7 +7634,6 @@ add_executable(grpc_control_plane_credentials_test
   test/core/security/control_plane_credentials_test.cc
 )
 
-
 target_include_directories(grpc_control_plane_credentials_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7788,7 +7664,6 @@ add_executable(grpc_create_jwt
   test/core/util/cmdline.cc
 )
 
-
 target_include_directories(grpc_create_jwt
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7818,7 +7693,6 @@ add_executable(grpc_credentials_test
   test/core/security/credentials_test.cc
 )
 
-
 target_include_directories(grpc_credentials_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7849,7 +7723,6 @@ add_executable(grpc_ipv6_loopback_available_test
   test/core/iomgr/grpc_ipv6_loopback_available_test.cc
 )
 
-
 target_include_directories(grpc_ipv6_loopback_available_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7881,7 +7754,6 @@ add_executable(grpc_json_token_test
   test/core/security/json_token_test.cc
 )
 
-
 target_include_directories(grpc_json_token_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7913,7 +7785,6 @@ add_executable(grpc_jwt_verifier_test
   test/core/security/jwt_verifier_test.cc
 )
 
-
 target_include_directories(grpc_jwt_verifier_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7944,7 +7815,6 @@ add_executable(grpc_print_google_default_creds_token
   test/core/util/cmdline.cc
 )
 
-
 target_include_directories(grpc_print_google_default_creds_token
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -7973,7 +7843,6 @@ add_executable(grpc_security_connector_test
   test/core/security/security_connector_test.cc
 )
 
-
 target_include_directories(grpc_security_connector_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8004,7 +7873,6 @@ add_executable(grpc_ssl_credentials_test
   test/core/security/ssl_credentials_test.cc
 )
 
-
 target_include_directories(grpc_ssl_credentials_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8035,7 +7903,6 @@ add_executable(grpc_verify_jwt
   test/core/util/cmdline.cc
 )
 
-
 target_include_directories(grpc_verify_jwt
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8065,7 +7932,6 @@ add_executable(handshake_client_ssl
   test/core/handshake/client_ssl.cc
 )
 
-
 target_include_directories(handshake_client_ssl
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8100,7 +7966,6 @@ add_executable(handshake_server_ssl
   test/core/handshake/server_ssl_common.cc
 )
 
-
 target_include_directories(handshake_server_ssl
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8135,7 +8000,6 @@ add_executable(handshake_server_with_readahead_handshaker
   test/core/handshake/server_ssl_common.cc
 )
 
-
 target_include_directories(handshake_server_with_readahead_handshaker
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8169,7 +8033,6 @@ add_executable(handshake_verify_peer_options
   test/core/handshake/verify_peer_options.cc
 )
 
-
 target_include_directories(handshake_verify_peer_options
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8202,7 +8065,6 @@ add_executable(histogram_test
   test/core/util/histogram_test.cc
 )
 
-
 target_include_directories(histogram_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8232,7 +8094,6 @@ add_executable(hpack_parser_test
   test/core/transport/chttp2/hpack_parser_test.cc
 )
 
-
 target_include_directories(hpack_parser_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8263,7 +8124,6 @@ add_executable(hpack_table_test
   test/core/transport/chttp2/hpack_table_test.cc
 )
 
-
 target_include_directories(hpack_table_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8294,7 +8154,6 @@ add_executable(http_parser_test
   test/core/http/parser_test.cc
 )
 
-
 target_include_directories(http_parser_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8325,7 +8184,6 @@ add_executable(httpcli_format_request_test
   test/core/http/format_request_test.cc
 )
 
-
 target_include_directories(httpcli_format_request_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8357,7 +8215,6 @@ add_executable(httpcli_test
   test/core/http/httpcli_test.cc
 )
 
-
 target_include_directories(httpcli_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8390,7 +8247,6 @@ add_executable(httpscli_test
   test/core/http/httpscli_test.cc
 )
 
-
 target_include_directories(httpscli_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8422,7 +8278,6 @@ add_executable(init_test
   test/core/surface/init_test.cc
 )
 
-
 target_include_directories(init_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8453,7 +8308,6 @@ add_executable(inproc_callback_test
   test/core/end2end/inproc_callback_test.cc
 )
 
-
 target_include_directories(inproc_callback_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8484,7 +8338,6 @@ add_executable(invalid_call_argument_test
   test/core/end2end/invalid_call_argument_test.cc
 )
 
-
 target_include_directories(invalid_call_argument_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8515,7 +8368,6 @@ add_executable(json_rewrite
   test/core/json/json_rewrite.cc
 )
 
-
 target_include_directories(json_rewrite
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8546,7 +8398,6 @@ add_executable(json_rewrite_test
   test/core/json/json_rewrite_test.cc
 )
 
-
 target_include_directories(json_rewrite_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8577,7 +8428,6 @@ add_executable(json_stream_error_test
   test/core/json/json_stream_error_test.cc
 )
 
-
 target_include_directories(json_stream_error_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8608,7 +8458,6 @@ add_executable(json_test
   test/core/json/json_test.cc
 )
 
-
 target_include_directories(json_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8639,7 +8488,6 @@ add_executable(lame_client_test
   test/core/surface/lame_client_test.cc
 )
 
-
 target_include_directories(lame_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8670,7 +8518,6 @@ add_executable(load_file_test
   test/core/iomgr/load_file_test.cc
 )
 
-
 target_include_directories(load_file_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8701,7 +8548,6 @@ add_executable(memory_usage_client
   test/core/memory_usage/client.cc
 )
 
-
 target_include_directories(memory_usage_client
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8732,7 +8578,6 @@ add_executable(memory_usage_server
   test/core/memory_usage/server.cc
 )
 
-
 target_include_directories(memory_usage_server
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8764,7 +8609,6 @@ add_executable(memory_usage_test
   test/core/memory_usage/memory_usage_test.cc
 )
 
-
 target_include_directories(memory_usage_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8796,7 +8640,6 @@ add_executable(message_compress_test
   test/core/compression/message_compress_test.cc
 )
 
-
 target_include_directories(message_compress_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8827,7 +8670,6 @@ add_executable(minimal_stack_is_minimal_test
   test/core/channel/minimal_stack_is_minimal_test.cc
 )
 
-
 target_include_directories(minimal_stack_is_minimal_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8858,7 +8700,6 @@ add_executable(mpmcqueue_test
   test/core/iomgr/mpmcqueue_test.cc
 )
 
-
 target_include_directories(mpmcqueue_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8889,7 +8730,6 @@ add_executable(multiple_server_queues_test
   test/core/end2end/multiple_server_queues_test.cc
 )
 
-
 target_include_directories(multiple_server_queues_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8920,7 +8760,6 @@ add_executable(murmur_hash_test
   test/core/gpr/murmur_hash_test.cc
 )
 
-
 target_include_directories(murmur_hash_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8951,7 +8790,6 @@ add_executable(no_server_test
   test/core/end2end/no_server_test.cc
 )
 
-
 target_include_directories(no_server_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -8982,7 +8820,6 @@ add_executable(num_external_connectivity_watchers_test
   test/core/surface/num_external_connectivity_watchers_test.cc
 )
 
-
 target_include_directories(num_external_connectivity_watchers_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9013,7 +8850,6 @@ add_executable(parse_address_test
   test/core/client_channel/parse_address_test.cc
 )
 
-
 target_include_directories(parse_address_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9045,7 +8881,6 @@ add_executable(parse_address_with_named_scope_id_test
   test/core/client_channel/parse_address_with_named_scope_id_test.cc
 )
 
-
 target_include_directories(parse_address_with_named_scope_id_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9077,7 +8912,6 @@ add_executable(percent_encoding_test
   test/core/slice/percent_encoding_test.cc
 )
 
-
 target_include_directories(percent_encoding_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9109,7 +8943,6 @@ add_executable(resolve_address_using_ares_resolver_posix_test
   test/core/iomgr/resolve_address_posix_test.cc
 )
 
-
 target_include_directories(resolve_address_using_ares_resolver_posix_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9141,7 +8974,6 @@ add_executable(resolve_address_using_ares_resolver_test
   test/core/iomgr/resolve_address_test.cc
 )
 
-
 target_include_directories(resolve_address_using_ares_resolver_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9173,7 +9005,6 @@ add_executable(resolve_address_using_native_resolver_posix_test
   test/core/iomgr/resolve_address_posix_test.cc
 )
 
-
 target_include_directories(resolve_address_using_native_resolver_posix_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9205,7 +9036,6 @@ add_executable(resolve_address_using_native_resolver_test
   test/core/iomgr/resolve_address_test.cc
 )
 
-
 target_include_directories(resolve_address_using_native_resolver_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9236,7 +9066,6 @@ add_executable(resource_quota_test
   test/core/iomgr/resource_quota_test.cc
 )
 
-
 target_include_directories(resource_quota_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9267,7 +9096,6 @@ add_executable(secure_channel_create_test
   test/core/surface/secure_channel_create_test.cc
 )
 
-
 target_include_directories(secure_channel_create_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9298,7 +9126,6 @@ add_executable(secure_endpoint_test
   test/core/security/secure_endpoint_test.cc
 )
 
-
 target_include_directories(secure_endpoint_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9329,7 +9156,6 @@ add_executable(sequential_connectivity_test
   test/core/surface/sequential_connectivity_test.cc
 )
 
-
 target_include_directories(sequential_connectivity_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9360,7 +9186,6 @@ add_executable(server_chttp2_test
   test/core/surface/server_chttp2_test.cc
 )
 
-
 target_include_directories(server_chttp2_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9391,7 +9216,6 @@ add_executable(server_test
   test/core/surface/server_test.cc
 )
 
-
 target_include_directories(server_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9422,7 +9246,6 @@ add_executable(slice_buffer_test
   test/core/slice/slice_buffer_test.cc
 )
 
-
 target_include_directories(slice_buffer_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9453,7 +9276,6 @@ add_executable(slice_string_helpers_test
   test/core/slice/slice_string_helpers_test.cc
 )
 
-
 target_include_directories(slice_string_helpers_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9484,7 +9306,6 @@ add_executable(slice_test
   test/core/slice/slice_test.cc
 )
 
-
 target_include_directories(slice_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9515,7 +9336,6 @@ add_executable(sockaddr_resolver_test
   test/core/client_channel/resolvers/sockaddr_resolver_test.cc
 )
 
-
 target_include_directories(sockaddr_resolver_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9546,7 +9366,6 @@ add_executable(sockaddr_utils_test
   test/core/iomgr/sockaddr_utils_test.cc
 )
 
-
 target_include_directories(sockaddr_utils_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9578,7 +9397,6 @@ add_executable(socket_utils_test
   test/core/iomgr/socket_utils_test.cc
 )
 
-
 target_include_directories(socket_utils_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9612,7 +9430,6 @@ add_executable(ssl_transport_security_test
   test/core/tsi/transport_security_test_lib.cc
 )
 
-
 target_include_directories(ssl_transport_security_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9644,7 +9461,6 @@ add_executable(status_conversion_test
   test/core/transport/status_conversion_test.cc
 )
 
-
 target_include_directories(status_conversion_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9675,7 +9491,6 @@ add_executable(stream_compression_test
   test/core/compression/stream_compression_test.cc
 )
 
-
 target_include_directories(stream_compression_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9706,7 +9521,6 @@ add_executable(stream_owned_slice_test
   test/core/transport/stream_owned_slice_test.cc
 )
 
-
 target_include_directories(stream_owned_slice_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9738,7 +9552,6 @@ add_executable(tcp_client_posix_test
   test/core/iomgr/tcp_client_posix_test.cc
 )
 
-
 target_include_directories(tcp_client_posix_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9770,7 +9583,6 @@ add_executable(tcp_client_uv_test
   test/core/iomgr/tcp_client_uv_test.cc
 )
 
-
 target_include_directories(tcp_client_uv_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9802,7 +9614,6 @@ add_executable(tcp_posix_test
   test/core/iomgr/tcp_posix_test.cc
 )
 
-
 target_include_directories(tcp_posix_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9835,7 +9646,6 @@ add_executable(tcp_server_posix_test
   test/core/iomgr/tcp_server_posix_test.cc
 )
 
-
 target_include_directories(tcp_server_posix_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9867,7 +9677,6 @@ add_executable(tcp_server_uv_test
   test/core/iomgr/tcp_server_uv_test.cc
 )
 
-
 target_include_directories(tcp_server_uv_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9898,7 +9707,6 @@ add_executable(threadpool_test
   test/core/iomgr/threadpool_test.cc
 )
 
-
 target_include_directories(threadpool_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9929,7 +9737,6 @@ add_executable(time_averaged_stats_test
   test/core/iomgr/time_averaged_stats_test.cc
 )
 
-
 target_include_directories(time_averaged_stats_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9960,7 +9767,6 @@ add_executable(timeout_encoding_test
   test/core/transport/timeout_encoding_test.cc
 )
 
-
 target_include_directories(timeout_encoding_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9991,7 +9797,6 @@ add_executable(timer_heap_test
   test/core/iomgr/timer_heap_test.cc
 )
 
-
 target_include_directories(timer_heap_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10022,7 +9827,6 @@ add_executable(timer_list_test
   test/core/iomgr/timer_list_test.cc
 )
 
-
 target_include_directories(timer_list_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10053,7 +9857,6 @@ add_executable(transport_metadata_test
   test/core/transport/metadata_test.cc
 )
 
-
 target_include_directories(transport_metadata_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10085,7 +9888,6 @@ add_executable(transport_security_test
   test/core/tsi/transport_security_test.cc
 )
 
-
 target_include_directories(transport_security_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10118,7 +9920,6 @@ add_executable(udp_server_test
   test/core/iomgr/udp_server_test.cc
 )
 
-
 target_include_directories(udp_server_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10150,7 +9951,6 @@ add_executable(uri_parser_test
   test/core/client_channel/uri_parser_test.cc
 )
 
-
 target_include_directories(uri_parser_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10183,7 +9983,6 @@ add_executable(alarm_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alarm_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10225,7 +10024,6 @@ add_executable(alts_counter_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_counter_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10265,7 +10063,6 @@ add_executable(alts_crypt_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_crypt_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10306,7 +10103,6 @@ add_executable(alts_crypter_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_crypter_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10346,7 +10142,6 @@ add_executable(alts_frame_handler_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_frame_handler_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10387,7 +10182,6 @@ add_executable(alts_frame_protector_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_frame_protector_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10427,7 +10221,6 @@ add_executable(alts_grpc_record_protocol_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_grpc_record_protocol_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10467,7 +10260,6 @@ add_executable(alts_handshaker_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_handshaker_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10507,7 +10299,6 @@ add_executable(alts_iovec_record_protocol_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_iovec_record_protocol_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10547,7 +10338,6 @@ add_executable(alts_security_connector_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_security_connector_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10586,7 +10376,6 @@ add_executable(alts_tsi_handshaker_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_tsi_handshaker_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10626,7 +10415,6 @@ add_executable(alts_tsi_utils_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_tsi_utils_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10666,7 +10454,6 @@ add_executable(alts_zero_copy_grpc_protector_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(alts_zero_copy_grpc_protector_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10706,7 +10493,6 @@ add_executable(async_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(async_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10748,7 +10534,6 @@ add_executable(auth_property_iterator_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(auth_property_iterator_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10790,7 +10575,6 @@ add_executable(backoff_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(backoff_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10830,7 +10614,6 @@ add_executable(bdp_estimator_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bdp_estimator_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10873,7 +10656,6 @@ add_executable(bm_alarm
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_alarm
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10920,7 +10702,6 @@ add_executable(bm_arena
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_arena
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -10967,7 +10748,6 @@ add_executable(bm_byte_buffer
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_byte_buffer
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11014,7 +10794,6 @@ add_executable(bm_call_create
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_call_create
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11061,7 +10840,6 @@ add_executable(bm_callback_streaming_ping_pong
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_callback_streaming_ping_pong
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11109,7 +10887,6 @@ add_executable(bm_callback_unary_ping_pong
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_callback_unary_ping_pong
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11157,7 +10934,6 @@ add_executable(bm_channel
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_channel
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11204,7 +10980,6 @@ add_executable(bm_chttp2_hpack
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_chttp2_hpack
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11251,7 +11026,6 @@ add_executable(bm_chttp2_transport
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_chttp2_transport
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11298,7 +11072,6 @@ add_executable(bm_closure
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_closure
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11345,7 +11118,6 @@ add_executable(bm_cq
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_cq
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11392,7 +11164,6 @@ add_executable(bm_cq_multiple_threads
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_cq_multiple_threads
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11439,7 +11210,6 @@ add_executable(bm_error
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_error
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11486,7 +11256,6 @@ add_executable(bm_fullstack_streaming_ping_pong
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_fullstack_streaming_ping_pong
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11533,7 +11302,6 @@ add_executable(bm_fullstack_streaming_pump
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_fullstack_streaming_pump
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11580,7 +11348,6 @@ add_executable(bm_fullstack_trickle
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_fullstack_trickle
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11627,7 +11394,6 @@ add_executable(bm_fullstack_unary_ping_pong
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_fullstack_unary_ping_pong
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11674,7 +11440,6 @@ add_executable(bm_metadata
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_metadata
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11721,7 +11486,6 @@ add_executable(bm_pollset
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_pollset
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11768,7 +11532,6 @@ add_executable(bm_threadpool
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_threadpool
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11815,7 +11578,6 @@ add_executable(bm_timer
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bm_timer
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11861,7 +11623,6 @@ add_executable(byte_stream_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(byte_stream_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11901,7 +11662,6 @@ add_executable(channel_arguments_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(channel_arguments_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11941,7 +11701,6 @@ add_executable(channel_filter_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(channel_filter_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11985,10 +11744,6 @@ add_executable(channel_trace_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/channelz/channelz.proto
-)
-
 target_include_directories(channel_trace_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12030,7 +11785,6 @@ add_executable(channelz_registry_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(channelz_registry_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12076,10 +11830,6 @@ add_executable(channelz_service_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/channelz/channelz.proto
-)
-
 target_include_directories(channelz_service_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12126,10 +11876,6 @@ add_executable(channelz_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/channelz/channelz.proto
-)
-
 target_include_directories(channelz_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12171,7 +11917,6 @@ add_executable(check_gcp_environment_linux_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(check_gcp_environment_linux_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12210,7 +11955,6 @@ add_executable(check_gcp_environment_windows_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(check_gcp_environment_windows_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12249,7 +11993,6 @@ add_executable(chttp2_settings_timeout_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(chttp2_settings_timeout_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12289,7 +12032,6 @@ add_executable(cli_call_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(cli_call_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12333,7 +12075,6 @@ add_executable(client_callback_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(client_callback_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12379,10 +12120,6 @@ add_executable(client_channel_stress_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/lb/v1/load_balancer.proto
-)
-
 target_include_directories(client_channel_stress_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12425,7 +12162,6 @@ add_executable(client_crash_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(client_crash_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12468,7 +12204,6 @@ add_executable(client_crash_test_server
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(client_crash_test_server
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12512,7 +12247,6 @@ add_executable(client_interceptors_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(client_interceptors_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12558,10 +12292,6 @@ add_executable(client_lb_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/xds/orca_load_report_for_test.proto
-)
-
 target_include_directories(client_lb_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12631,28 +12361,6 @@ add_executable(codegen_test_full
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/control.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/payloads.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/benchmark_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/report_qps_scenario_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/worker_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/stats.proto
-)
-
 target_include_directories(codegen_test_full
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12722,28 +12430,6 @@ add_executable(codegen_test_minimal
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/control.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/payloads.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/benchmark_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/report_qps_scenario_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/worker_service.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/stats.proto
-)
-
 target_include_directories(codegen_test_minimal
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12783,7 +12469,6 @@ add_executable(context_list_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(context_list_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12823,7 +12508,6 @@ add_executable(credentials_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(credentials_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12863,7 +12547,6 @@ add_executable(cxx_byte_buffer_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(cxx_byte_buffer_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12904,7 +12587,6 @@ add_executable(cxx_slice_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(cxx_slice_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12945,7 +12627,6 @@ add_executable(cxx_string_ref_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(cxx_string_ref_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12984,7 +12665,6 @@ add_executable(cxx_time_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(cxx_time_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13025,7 +12705,6 @@ add_executable(delegating_channel_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(delegating_channel_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13068,7 +12747,6 @@ add_executable(end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13114,10 +12792,6 @@ add_executable(error_details_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo_messages.proto
-)
-
 target_include_directories(error_details_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13156,7 +12830,6 @@ add_executable(exception_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(exception_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13198,7 +12871,6 @@ add_executable(filter_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(filter_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13237,7 +12909,6 @@ add_executable(gen_hpack_tables
   tools/codegen/core/gen_hpack_tables.cc
 )
 
-
 target_include_directories(gen_hpack_tables
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13267,7 +12938,6 @@ add_executable(gen_legal_metadata_characters
   tools/codegen/core/gen_legal_metadata_characters.cc
 )
 
-
 target_include_directories(gen_legal_metadata_characters
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13295,7 +12965,6 @@ add_executable(gen_percent_encoding_tables
   tools/codegen/core/gen_percent_encoding_tables.cc
 )
 
-
 target_include_directories(gen_percent_encoding_tables
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13326,7 +12995,6 @@ add_executable(generic_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(generic_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13368,7 +13036,6 @@ add_executable(global_config_env_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(global_config_env_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13407,7 +13074,6 @@ add_executable(global_config_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(global_config_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13450,10 +13116,6 @@ add_executable(golden_file_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/compiler_test.proto
-)
-
 target_include_directories(golden_file_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13494,7 +13156,6 @@ add_executable(gprpp_mpscq_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(gprpp_mpscq_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13534,7 +13195,6 @@ add_executable(grpc_alts_credentials_options_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(grpc_alts_credentials_options_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13573,7 +13233,6 @@ add_executable(grpc_cli
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(grpc_cli
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13614,7 +13273,6 @@ add_executable(grpc_cpp_plugin
   src/compiler/cpp_plugin.cc
 )
 
-
 target_include_directories(grpc_cpp_plugin
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13655,7 +13313,6 @@ add_executable(grpc_csharp_plugin
   src/compiler/csharp_plugin.cc
 )
 
-
 target_include_directories(grpc_csharp_plugin
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13698,7 +13355,6 @@ add_executable(grpc_fetch_oauth2
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(grpc_fetch_oauth2
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13739,7 +13395,6 @@ add_executable(grpc_linux_system_roots_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(grpc_linux_system_roots_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13777,7 +13432,6 @@ add_executable(grpc_node_plugin
   src/compiler/node_plugin.cc
 )
 
-
 target_include_directories(grpc_node_plugin
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13818,7 +13472,6 @@ add_executable(grpc_objective_c_plugin
   src/compiler/objective_c_plugin.cc
 )
 
-
 target_include_directories(grpc_objective_c_plugin
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13859,7 +13512,6 @@ add_executable(grpc_php_plugin
   src/compiler/php_plugin.cc
 )
 
-
 target_include_directories(grpc_php_plugin
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13900,7 +13552,6 @@ add_executable(grpc_python_plugin
   src/compiler/python_plugin.cc
 )
 
-
 target_include_directories(grpc_python_plugin
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13941,7 +13592,6 @@ add_executable(grpc_ruby_plugin
   src/compiler/ruby_plugin.cc
 )
 
-
 target_include_directories(grpc_ruby_plugin
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -13984,7 +13634,6 @@ add_executable(grpc_spiffe_security_connector_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(grpc_spiffe_security_connector_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14034,13 +13683,6 @@ add_executable(grpc_tool_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo_messages.proto
-)
-
 target_include_directories(grpc_tool_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14089,10 +13731,6 @@ add_executable(grpclb_api_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/lb/v1/load_balancer.proto
-)
-
 target_include_directories(grpclb_api_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14137,10 +13775,6 @@ add_executable(grpclb_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/lb/v1/load_balancer.proto
-)
-
 target_include_directories(grpclb_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14195,16 +13829,6 @@ add_executable(grpclb_fallback_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/empty.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/test.proto
-)
-
 target_include_directories(grpclb_fallback_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14248,7 +13872,6 @@ add_executable(h2_ssl_cert_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(h2_ssl_cert_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14289,7 +13912,6 @@ add_executable(h2_ssl_session_reuse_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(h2_ssl_session_reuse_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14330,7 +13952,6 @@ add_executable(health_service_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(health_service_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14372,7 +13993,6 @@ add_executable(http2_client
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(http2_client
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14416,7 +14036,6 @@ add_executable(hybrid_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(hybrid_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14458,7 +14077,6 @@ add_executable(inlined_vector_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(inlined_vector_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14500,7 +14118,6 @@ add_executable(inproc_sync_unary_ping_pong_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(inproc_sync_unary_ping_pong_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14546,7 +14163,6 @@ add_executable(interop_client
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(interop_client
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14592,7 +14208,6 @@ add_executable(interop_server
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(interop_server
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14640,7 +14255,6 @@ add_executable(interop_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(interop_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14683,7 +14297,6 @@ add_executable(json_run_localhost
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(json_run_localhost
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14727,7 +14340,6 @@ add_executable(memory_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(memory_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14768,7 +14380,6 @@ add_executable(message_allocator_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(message_allocator_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14814,10 +14425,6 @@ add_executable(metrics_client
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/metrics.proto
-)
-
 target_include_directories(metrics_client
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14858,7 +14465,6 @@ add_executable(mock_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(mock_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14900,7 +14506,6 @@ add_executable(nonblocking_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(nonblocking_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14942,7 +14547,6 @@ add_executable(noop-benchmark
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(noop-benchmark
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -14980,7 +14584,6 @@ add_executable(optional_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(optional_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15021,7 +14624,6 @@ add_executable(orphanable_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(orphanable_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15062,7 +14664,6 @@ add_executable(port_sharing_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(port_sharing_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15105,7 +14706,6 @@ add_executable(proto_server_reflection_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(proto_server_reflection_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15149,7 +14749,6 @@ add_executable(proto_utils_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(proto_utils_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15189,7 +14788,6 @@ add_executable(qps_interarrival_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(qps_interarrival_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15234,7 +14832,6 @@ add_executable(qps_json_driver
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(qps_json_driver
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15280,7 +14877,6 @@ add_executable(qps_openloop_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(qps_openloop_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15326,7 +14922,6 @@ add_executable(qps_worker
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(qps_worker
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15371,7 +14966,6 @@ add_executable(raw_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(raw_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15425,16 +15019,6 @@ add_executable(reconnect_interop_client
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/empty.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/test.proto
-)
-
 target_include_directories(reconnect_interop_client
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15489,16 +15073,6 @@ add_executable(reconnect_interop_server
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/empty.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/test.proto
-)
-
 target_include_directories(reconnect_interop_server
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15543,7 +15117,6 @@ add_executable(ref_counted_ptr_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(ref_counted_ptr_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15584,7 +15157,6 @@ add_executable(ref_counted_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(ref_counted_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15625,7 +15197,6 @@ add_executable(retry_throttle_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(retry_throttle_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15665,7 +15236,6 @@ add_executable(secure_auth_context_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(secure_auth_context_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15708,7 +15278,6 @@ add_executable(secure_sync_unary_ping_pong_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(secure_sync_unary_ping_pong_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15754,7 +15323,6 @@ add_executable(server_builder_plugin_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(server_builder_plugin_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15804,13 +15372,6 @@ add_executable(server_builder_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo_messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo.proto
-)
-
 target_include_directories(server_builder_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15861,13 +15422,6 @@ add_executable(server_builder_with_socket_mutator_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo_messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo.proto
-)
-
 target_include_directories(server_builder_with_socket_mutator_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15910,7 +15464,6 @@ add_executable(server_context_test_spouse_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(server_context_test_spouse_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15952,7 +15505,6 @@ add_executable(server_crash_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(server_crash_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -15995,7 +15547,6 @@ add_executable(server_crash_test_client
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(server_crash_test_client
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16038,7 +15589,6 @@ add_executable(server_early_return_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(server_early_return_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16081,7 +15631,6 @@ add_executable(server_interceptors_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(server_interceptors_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16131,13 +15680,6 @@ add_executable(server_request_call_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo_messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/echo.proto
-)
-
 target_include_directories(server_request_call_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16179,7 +15721,6 @@ add_executable(service_config_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(service_config_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16221,7 +15762,6 @@ add_executable(service_config_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(service_config_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16262,7 +15802,6 @@ add_executable(shutdown_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(shutdown_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16304,7 +15843,6 @@ add_executable(slice_hash_table_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(slice_hash_table_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16344,7 +15882,6 @@ add_executable(slice_weak_hash_table_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(slice_weak_hash_table_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16384,7 +15921,6 @@ add_executable(stats_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(stats_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16425,7 +15961,6 @@ add_executable(status_metadata_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(status_metadata_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16463,7 +15998,6 @@ add_executable(status_util_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(status_util_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16502,7 +16036,6 @@ add_executable(streaming_throughput_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(streaming_throughput_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16564,19 +16097,6 @@ add_executable(stress_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/empty.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/messages.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/metrics.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/test.proto
-)
-
 target_include_directories(stress_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16619,7 +16139,6 @@ add_executable(string_view_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(string_view_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16660,7 +16179,6 @@ add_executable(thread_manager_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(thread_manager_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16703,7 +16221,6 @@ add_executable(thread_stress_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(thread_stress_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16746,7 +16263,6 @@ add_executable(time_change_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(time_change_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16789,7 +16305,6 @@ add_executable(timer_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(timer_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16830,7 +16345,6 @@ add_executable(transport_connectivity_state_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(transport_connectivity_state_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16870,7 +16384,6 @@ add_executable(transport_pid_controller_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(transport_pid_controller_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16912,7 +16425,6 @@ add_executable(transport_security_common_api_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(transport_security_common_api_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16953,7 +16465,6 @@ add_executable(writes_per_rpc_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(writes_per_rpc_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -16996,7 +16507,6 @@ add_executable(xds_bootstrap_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(xds_bootstrap_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17049,16 +16559,6 @@ add_executable(xds_end2end_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/xds/ads_for_test.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/xds/eds_for_test.proto
-)
-protobuf_generate_grpc_cpp(
-  src/proto/grpc/testing/xds/lrs_for_test.proto
-)
-
 target_include_directories(xds_end2end_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17098,7 +16598,6 @@ add_executable(public_headers_must_be_c89
   test/core/surface/public_headers_must_be_c89.c
 )
 
-
 target_include_directories(public_headers_must_be_c89
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17130,7 +16629,6 @@ add_executable(bad_streaming_id_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(bad_streaming_id_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17171,7 +16669,6 @@ add_executable(badreq_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(badreq_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17212,7 +16709,6 @@ add_executable(connection_prefix_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(connection_prefix_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17253,7 +16749,6 @@ add_executable(duplicate_header_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(duplicate_header_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17294,7 +16789,6 @@ add_executable(head_of_line_blocking_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(head_of_line_blocking_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17335,7 +16829,6 @@ add_executable(headers_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(headers_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17376,7 +16869,6 @@ add_executable(initial_settings_frame_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(initial_settings_frame_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17417,7 +16909,6 @@ add_executable(large_metadata_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(large_metadata_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17458,7 +16949,6 @@ add_executable(out_of_bounds_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(out_of_bounds_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17499,7 +16989,6 @@ add_executable(server_registered_method_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(server_registered_method_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17540,7 +17029,6 @@ add_executable(simple_request_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(simple_request_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17581,7 +17069,6 @@ add_executable(unknown_frame_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(unknown_frame_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17622,7 +17109,6 @@ add_executable(window_overflow_bad_client_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(window_overflow_bad_client_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17662,7 +17148,6 @@ add_executable(bad_ssl_cert_server
   test/core/bad_ssl/servers/cert.cc
 )
 
-
 target_include_directories(bad_ssl_cert_server
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17696,7 +17181,6 @@ add_executable(bad_ssl_cert_test
   test/core/bad_ssl/bad_ssl_test.cc
 )
 
-
 target_include_directories(bad_ssl_cert_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17728,7 +17212,6 @@ add_executable(h2_census_test
   test/core/end2end/fixtures/h2_census.cc
 )
 
-
 target_include_directories(h2_census_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17760,7 +17243,6 @@ add_executable(h2_compress_test
   test/core/end2end/fixtures/h2_compress.cc
 )
 
-
 target_include_directories(h2_compress_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17792,7 +17274,6 @@ add_executable(h2_fakesec_test
   test/core/end2end/fixtures/h2_fakesec.cc
 )
 
-
 target_include_directories(h2_fakesec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17825,7 +17306,6 @@ add_executable(h2_fd_test
   test/core/end2end/fixtures/h2_fd.cc
 )
 
-
 target_include_directories(h2_fd_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17858,7 +17338,6 @@ add_executable(h2_full_test
   test/core/end2end/fixtures/h2_full.cc
 )
 
-
 target_include_directories(h2_full_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17891,7 +17370,6 @@ add_executable(h2_full+pipe_test
   test/core/end2end/fixtures/h2_full+pipe.cc
 )
 
-
 target_include_directories(h2_full+pipe_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17924,7 +17402,6 @@ add_executable(h2_full+trace_test
   test/core/end2end/fixtures/h2_full+trace.cc
 )
 
-
 target_include_directories(h2_full+trace_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17956,7 +17433,6 @@ add_executable(h2_full+workarounds_test
   test/core/end2end/fixtures/h2_full+workarounds.cc
 )
 
-
 target_include_directories(h2_full+workarounds_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -17988,7 +17464,6 @@ add_executable(h2_http_proxy_test
   test/core/end2end/fixtures/h2_http_proxy.cc
 )
 
-
 target_include_directories(h2_http_proxy_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18021,7 +17496,6 @@ add_executable(h2_local_ipv4_test
   test/core/end2end/fixtures/h2_local_ipv4.cc
 )
 
-
 target_include_directories(h2_local_ipv4_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18055,7 +17529,6 @@ add_executable(h2_local_ipv6_test
   test/core/end2end/fixtures/h2_local_ipv6.cc
 )
 
-
 target_include_directories(h2_local_ipv6_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18089,7 +17562,6 @@ add_executable(h2_local_uds_test
   test/core/end2end/fixtures/h2_local_uds.cc
 )
 
-
 target_include_directories(h2_local_uds_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18122,7 +17594,6 @@ add_executable(h2_oauth2_test
   test/core/end2end/fixtures/h2_oauth2.cc
 )
 
-
 target_include_directories(h2_oauth2_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18154,7 +17625,6 @@ add_executable(h2_proxy_test
   test/core/end2end/fixtures/h2_proxy.cc
 )
 
-
 target_include_directories(h2_proxy_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18186,7 +17656,6 @@ add_executable(h2_sockpair_test
   test/core/end2end/fixtures/h2_sockpair.cc
 )
 
-
 target_include_directories(h2_sockpair_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18218,7 +17687,6 @@ add_executable(h2_sockpair+trace_test
   test/core/end2end/fixtures/h2_sockpair+trace.cc
 )
 
-
 target_include_directories(h2_sockpair+trace_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18250,7 +17718,6 @@ add_executable(h2_sockpair_1byte_test
   test/core/end2end/fixtures/h2_sockpair_1byte.cc
 )
 
-
 target_include_directories(h2_sockpair_1byte_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18282,7 +17749,6 @@ add_executable(h2_spiffe_test
   test/core/end2end/fixtures/h2_spiffe.cc
 )
 
-
 target_include_directories(h2_spiffe_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18314,7 +17780,6 @@ add_executable(h2_ssl_test
   test/core/end2end/fixtures/h2_ssl.cc
 )
 
-
 target_include_directories(h2_ssl_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18346,7 +17811,6 @@ add_executable(h2_ssl_cred_reload_test
   test/core/end2end/fixtures/h2_ssl_cred_reload.cc
 )
 
-
 target_include_directories(h2_ssl_cred_reload_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18378,7 +17842,6 @@ add_executable(h2_ssl_proxy_test
   test/core/end2end/fixtures/h2_ssl_proxy.cc
 )
 
-
 target_include_directories(h2_ssl_proxy_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18411,7 +17874,6 @@ add_executable(h2_uds_test
   test/core/end2end/fixtures/h2_uds.cc
 )
 
-
 target_include_directories(h2_uds_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18444,7 +17906,6 @@ add_executable(inproc_test
   test/core/end2end/fixtures/inproc.cc
 )
 
-
 target_include_directories(inproc_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18476,7 +17937,6 @@ add_executable(h2_census_nosec_test
   test/core/end2end/fixtures/h2_census.cc
 )
 
-
 target_include_directories(h2_census_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18508,7 +17968,6 @@ add_executable(h2_compress_nosec_test
   test/core/end2end/fixtures/h2_compress.cc
 )
 
-
 target_include_directories(h2_compress_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18541,7 +18000,6 @@ add_executable(h2_fd_nosec_test
   test/core/end2end/fixtures/h2_fd.cc
 )
 
-
 target_include_directories(h2_fd_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18574,7 +18032,6 @@ add_executable(h2_full_nosec_test
   test/core/end2end/fixtures/h2_full.cc
 )
 
-
 target_include_directories(h2_full_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18607,7 +18064,6 @@ add_executable(h2_full+pipe_nosec_test
   test/core/end2end/fixtures/h2_full+pipe.cc
 )
 
-
 target_include_directories(h2_full+pipe_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18640,7 +18096,6 @@ add_executable(h2_full+trace_nosec_test
   test/core/end2end/fixtures/h2_full+trace.cc
 )
 
-
 target_include_directories(h2_full+trace_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18672,7 +18127,6 @@ add_executable(h2_full+workarounds_nosec_test
   test/core/end2end/fixtures/h2_full+workarounds.cc
 )
 
-
 target_include_directories(h2_full+workarounds_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18704,7 +18158,6 @@ add_executable(h2_http_proxy_nosec_test
   test/core/end2end/fixtures/h2_http_proxy.cc
 )
 
-
 target_include_directories(h2_http_proxy_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18736,7 +18189,6 @@ add_executable(h2_proxy_nosec_test
   test/core/end2end/fixtures/h2_proxy.cc
 )
 
-
 target_include_directories(h2_proxy_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18768,7 +18220,6 @@ add_executable(h2_sockpair_nosec_test
   test/core/end2end/fixtures/h2_sockpair.cc
 )
 
-
 target_include_directories(h2_sockpair_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18800,7 +18251,6 @@ add_executable(h2_sockpair+trace_nosec_test
   test/core/end2end/fixtures/h2_sockpair+trace.cc
 )
 
-
 target_include_directories(h2_sockpair+trace_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18832,7 +18282,6 @@ add_executable(h2_sockpair_1byte_nosec_test
   test/core/end2end/fixtures/h2_sockpair_1byte.cc
 )
 
-
 target_include_directories(h2_sockpair_1byte_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18865,7 +18314,6 @@ add_executable(h2_uds_nosec_test
   test/core/end2end/fixtures/h2_uds.cc
 )
 
-
 target_include_directories(h2_uds_nosec_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18900,7 +18348,6 @@ add_executable(resolver_component_test_unsecure
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(resolver_component_test_unsecure
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18944,7 +18391,6 @@ add_executable(resolver_component_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(resolver_component_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -18989,7 +18435,6 @@ add_executable(resolver_component_tests_runner_invoker_unsecure
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(resolver_component_tests_runner_invoker_unsecure
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19034,7 +18479,6 @@ add_executable(resolver_component_tests_runner_invoker
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(resolver_component_tests_runner_invoker
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19078,7 +18522,6 @@ add_executable(address_sorting_test_unsecure
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(address_sorting_test_unsecure
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19121,7 +18564,6 @@ add_executable(address_sorting_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(address_sorting_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19164,7 +18606,6 @@ add_executable(cancel_ares_query_test
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
-
 target_include_directories(cancel_ares_query_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19207,7 +18648,6 @@ add_executable(alts_credentials_fuzzer_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(alts_credentials_fuzzer_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19239,7 +18679,6 @@ add_executable(api_fuzzer_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(api_fuzzer_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19271,7 +18710,6 @@ add_executable(client_fuzzer_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(client_fuzzer_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19303,7 +18741,6 @@ add_executable(hpack_parser_fuzzer_test_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(hpack_parser_fuzzer_test_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19335,7 +18772,6 @@ add_executable(http_request_fuzzer_test_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(http_request_fuzzer_test_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19367,7 +18803,6 @@ add_executable(http_response_fuzzer_test_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(http_response_fuzzer_test_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19399,7 +18834,6 @@ add_executable(json_fuzzer_test_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(json_fuzzer_test_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19431,7 +18865,6 @@ add_executable(nanopb_fuzzer_response_test_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(nanopb_fuzzer_response_test_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19463,7 +18896,6 @@ add_executable(nanopb_fuzzer_serverlist_test_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(nanopb_fuzzer_serverlist_test_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19495,7 +18927,6 @@ add_executable(percent_decode_fuzzer_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(percent_decode_fuzzer_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19527,7 +18958,6 @@ add_executable(percent_encode_fuzzer_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(percent_encode_fuzzer_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19559,7 +18989,6 @@ add_executable(server_fuzzer_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(server_fuzzer_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19591,7 +19020,6 @@ add_executable(ssl_server_fuzzer_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(ssl_server_fuzzer_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -19623,7 +19051,6 @@ add_executable(uri_fuzzer_test_one_entry
   test/core/util/one_corpus_entry_fuzzer.cc
 )
 
-
 target_include_directories(uri_fuzzer_test_one_entry
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 0eece244b08..a2d2c745ee0 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -68,6 +68,21 @@
       return ''
     return 'endif()\n'
   %>
+  <%
+  # These files are added to a set so that they are not duplicated if multiple
+  # targets use them. Generating the same file multiple times with
+  # add_custom_command() is not allowed in CMake.
+
+  protobuf_gen_files = set()
+  for tgt in targets:
+    for src in tgt.src:
+      if proto_re.match(src):
+        protobuf_gen_files.add(src)
+  for lib in libs:
+    for src in lib.src:
+      if proto_re.match(src):
+        protobuf_gen_files.add(src)
+  %>
 
   cmake_minimum_required(VERSION 3.5.1)
 
@@ -300,6 +315,12 @@
   add_custom_target(tools
     DEPENDS tools_c tools_cxx)
 
+  % for src in sorted(protobuf_gen_files):
+  protobuf_generate_grpc_cpp(
+    ${src}
+  )
+  % endfor
+
   if (gRPC_BUILD_TESTS)
   add_custom_target(buildtests_c)
   % for tgt in targets:
@@ -429,14 +450,6 @@
     endif()
   endif()
 
-  % for src in lib.src:
-  % if proto_re.match(src):
-  protobuf_generate_grpc_cpp(
-    ${src}
-  )
-  % endif
-  % endfor
-
   target_include_directories(${lib.name}
     PUBLIC <%text>$<INSTALL_INTERFACE:${gRPC_INSTALL_INCLUDEDIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include></%text>
     PRIVATE <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>
@@ -519,14 +532,6 @@
   % endif
   )
 
-  % for src in tgt.src:
-  % if proto_re.match(src):
-  protobuf_generate_grpc_cpp(
-    ${src}
-  )
-  % endif
-  % endfor
-
   target_include_directories(${tgt.name}
     PRIVATE <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>
     PRIVATE <%text>${CMAKE_CURRENT_SOURCE_DIR}</%text>/include