From f2ffbb89a2f7456b897e5556782e8639d161a6f6 Mon Sep 17 00:00:00 2001
From: Sreenithi Sridharan <19sreenithi98@gmail.com>
Date: Wed, 25 Sep 2024 20:11:10 -0700
Subject: [PATCH 01/74] Add templating and support for Python 3.13 (#37643)

This PR adds templating for Python versions and updates the maximum supported Python version to 3.13. The following major changes related to templating are added:
 - Minimum supported Python version and list of supported versions in `setup.py` are fetched using new template generated files called `python_version.py`
 - Dockerfiles for the different Python Linux builds are now template generated.
 - The "Supported Python Versions" section from READMEs of ancillary and main packages have been removed

Note: All the `python_version.py` files and Linux build `Dockerfiles` except `tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile` in the PR are generated from the respective templates.

Further non-templated additions to add support for Python 3.13:
 - install scripts and artifacts for windows, macos and linux are added manually. Later, these can be templated as well.
 - updated cython bounds to 3.x
 - updated twine version to solve [cgi module import error](https://github.com/pypa/twine/issues/1046)
 - the twine update introduces a dependency on cryptography>=2.0. But the cryptography package doesn't support 32-bit Linux images and hence `twine check` has been disabled for x86 manylinux and x86 musllinux artifacts.

Closes #37643

PiperOrigin-RevId: 678954495
---
 PYTHON-MANIFEST.in                            |  1 +
 WORKSPACE                                     |  2 +-
 bazel/grpc_python_deps.bzl                    |  6 +-
 black.toml                                    |  1 +
 build_handwritten.yaml                        |  7 +++
 setup.py                                      | 27 +++++----
 src/python/grpcio/README.rst                  |  3 -
 src/python/grpcio/python_version.py           | 20 +++++++
 src/python/grpcio_admin/MANIFEST.in           |  1 +
 src/python/grpcio_admin/python_version.py     | 20 +++++++
 src/python/grpcio_admin/setup.py              |  5 +-
 src/python/grpcio_channelz/MANIFEST.in        |  1 +
 src/python/grpcio_channelz/README.rst         |  3 -
 src/python/grpcio_channelz/grpc_version.py    |  2 +-
 src/python/grpcio_channelz/python_version.py  | 20 +++++++
 src/python/grpcio_channelz/setup.py           | 29 ++++++----
 src/python/grpcio_csds/MANIFEST.in            |  1 +
 src/python/grpcio_csds/python_version.py      | 20 +++++++
 src/python/grpcio_csds/setup.py               |  4 +-
 .../grpcio_csm_observability/MANIFEST.in      |  1 +
 .../grpcio_csm_observability/README.rst       |  3 -
 .../python_version.py                         | 20 +++++++
 src/python/grpcio_csm_observability/setup.py  |  4 +-
 src/python/grpcio_health_checking/MANIFEST.in |  1 +
 src/python/grpcio_health_checking/README.rst  |  3 -
 .../grpcio_health_checking/python_version.py  | 20 +++++++
 src/python/grpcio_health_checking/setup.py    | 27 +++++----
 src/python/grpcio_observability/MANIFEST.in   |  1 +
 src/python/grpcio_observability/README.rst    |  3 -
 .../grpcio_observability/python_version.py    | 20 +++++++
 src/python/grpcio_observability/setup.py      |  3 +-
 src/python/grpcio_reflection/MANIFEST.in      |  1 +
 src/python/grpcio_reflection/README.rst       |  3 -
 .../grpcio_reflection/python_version.py       | 20 +++++++
 src/python/grpcio_reflection/setup.py         | 27 +++++----
 src/python/grpcio_status/MANIFEST.in          |  1 +
 src/python/grpcio_status/README.rst           |  3 -
 src/python/grpcio_status/python_version.py    | 20 +++++++
 src/python/grpcio_status/setup.py             | 27 +++++----
 src/python/grpcio_testing/README.rst          |  3 -
 .../python/grpcio/python_version.py.template  | 22 +++++++
 .../grpcio_admin/python_version.py.template   | 22 +++++++
 .../grpcio_channelz/grpc_version.py.template  |  2 +-
 .../python_version.py.template                | 22 +++++++
 .../grpcio_csds/python_version.py.template    | 22 +++++++
 .../python_version.py.template                | 22 +++++++
 .../python_version.py.template                | 22 +++++++
 .../python_version.py.template                | 22 +++++++
 .../python_version.py.template                | 22 +++++++
 .../grpcio_status/python_version.py.template  | 22 +++++++
 .../distrib/python/grpc_version.py.template   |  2 +-
 .../grpc_tools/python_version.py.template     | 22 +++++++
 .../grpcio_tools/python_version.py.template   | 22 +++++++
 .../xds_protos/grpc_version.py.template       |  2 +-
 .../xds_protos/python_version.py.template     | 22 +++++++
 .../dockerfile/ccache_crosscompile.include    | 14 +++++
 .../dockerfile/compile_python_313.include     | 21 +++++++
 templates/tools/dockerfile/git_config.include | 22 +++++++
 .../Dockerfile.template                       | 57 +++++++++++++++++++
 .../Dockerfile.template                       | 28 +++++++++
 .../Dockerfile.template                       | 33 +++++++++++
 .../Dockerfile.template                       | 34 +++++++++++
 .../Dockerfile.template                       | 27 +++++++++
 .../Dockerfile.template                       | 25 ++++++++
 .../dockerfile/python_pip_builds.include      |  8 +++
 .../Dockerfile.template                       |  1 +
 test/distrib/bazel/python/WORKSPACE           |  2 +-
 .../dockerimage_current_versions.bzl          | 14 ++---
 tools/bazelify_tests/test/BUILD               |  8 +--
 ... build_artifact_python_linux_x64_cp313.sh} |  4 +-
 .../expand_supported_python_versions.py       | 33 +++++++++++
 tools/distrib/install_all_python_modules.sh   |  1 -
 tools/distrib/python/grpc_version.py          |  2 +-
 tools/distrib/python/grpcio_tools/MANIFEST.in |  2 +
 .../grpcio_tools/grpc_tools/python_version.py | 20 +++++++
 .../python/grpcio_tools/python_version.py     | 20 +++++++
 tools/distrib/python/grpcio_tools/setup.py    |  3 +-
 tools/distrib/python/xds_protos/MANIFEST.in   |  1 +
 .../distrib/python/xds_protos/grpc_version.py |  2 +-
 .../python/xds_protos/python_version.py       | 20 +++++++
 tools/distrib/python/xds_protos/setup.py      |  4 +-
 tools/dockerfile/README.md                    |  4 ++
 ...rtifact_python_linux_armv7.current_version |  2 +-
 .../Dockerfile                                | 40 ++++++++++---
 ...stall_python_for_wheel_crosscompilation.sh |  2 +-
 ...thon_manylinux2014_aarch64.current_version |  2 +-
 .../Dockerfile                                | 50 +++++++++++-----
 ...t_python_manylinux2014_x64.current_version |  2 +-
 .../Dockerfile                                | 48 +++++++++++-----
 ...t_python_manylinux2014_x86.current_version |  2 +-
 .../Dockerfile                                | 48 +++++++++++-----
 ...t_python_musllinux_1_1_x64.current_version |  2 +-
 .../Dockerfile                                | 52 ++++++++++++-----
 ...t_python_musllinux_1_1_x86.current_version |  2 +-
 .../Dockerfile                                | 50 +++++++++++-----
 ...ython_debian11_default_x64.current_version |  2 +-
 .../python_debian11_default_x64/Dockerfile    | 22 +++++++
 .../install_python_interpreters.ps1           | 17 ++++++
 .../helper_scripts/prepare_build_macos_rc     |  8 +++
 .../helper_scripts/requirements.macos.txt     |  2 +-
 .../macos/grpc_distribtests_python.sh         | 12 ++--
 tools/run_tests/artifacts/artifact_targets.py | 32 ++++++++---
 .../artifacts/build_artifact_python.bat       |  2 +-
 .../artifacts/build_artifact_python.sh        |  5 +-
 tools/run_tests/run_tests.py                  | 10 ++++
 105 files changed, 1260 insertions(+), 218 deletions(-)
 create mode 100644 src/python/grpcio/python_version.py
 create mode 100644 src/python/grpcio_admin/python_version.py
 create mode 100644 src/python/grpcio_channelz/python_version.py
 create mode 100644 src/python/grpcio_csds/python_version.py
 create mode 100644 src/python/grpcio_csm_observability/python_version.py
 create mode 100644 src/python/grpcio_health_checking/python_version.py
 create mode 100644 src/python/grpcio_observability/python_version.py
 create mode 100644 src/python/grpcio_reflection/python_version.py
 create mode 100644 src/python/grpcio_status/python_version.py
 create mode 100644 templates/src/python/grpcio/python_version.py.template
 create mode 100644 templates/src/python/grpcio_admin/python_version.py.template
 create mode 100644 templates/src/python/grpcio_channelz/python_version.py.template
 create mode 100644 templates/src/python/grpcio_csds/python_version.py.template
 create mode 100644 templates/src/python/grpcio_csm_observability/python_version.py.template
 create mode 100644 templates/src/python/grpcio_health_checking/python_version.py.template
 create mode 100644 templates/src/python/grpcio_observability/python_version.py.template
 create mode 100644 templates/src/python/grpcio_reflection/python_version.py.template
 create mode 100644 templates/src/python/grpcio_status/python_version.py.template
 create mode 100644 templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template
 create mode 100644 templates/tools/distrib/python/grpcio_tools/python_version.py.template
 create mode 100644 templates/tools/distrib/python/xds_protos/python_version.py.template
 create mode 100644 templates/tools/dockerfile/ccache_crosscompile.include
 create mode 100644 templates/tools/dockerfile/compile_python_313.include
 create mode 100644 templates/tools/dockerfile/git_config.include
 create mode 100644 templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template
 create mode 100644 templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template
 create mode 100644 templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template
 create mode 100644 templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template
 create mode 100644 templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template
 create mode 100644 templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template
 create mode 100644 templates/tools/dockerfile/python_pip_builds.include
 rename tools/bazelify_tests/test/{build_artifact_python_linux_x64_cp312.sh => build_artifact_python_linux_x64_cp313.sh} (93%)
 create mode 100644 tools/buildgen/plugins/expand_supported_python_versions.py
 create mode 100644 tools/distrib/python/grpcio_tools/grpc_tools/python_version.py
 create mode 100644 tools/distrib/python/grpcio_tools/python_version.py
 create mode 100644 tools/distrib/python/xds_protos/python_version.py

diff --git a/PYTHON-MANIFEST.in b/PYTHON-MANIFEST.in
index dd76dbcf756..b8ab04726ed 100644
--- a/PYTHON-MANIFEST.in
+++ b/PYTHON-MANIFEST.in
@@ -17,6 +17,7 @@ include src/python/grpcio/_parallel_compile_patch.py
 include src/python/grpcio/_spawn_patch.py
 include src/python/grpcio/commands.py
 include src/python/grpcio/grpc_version.py
+include src/python/grpcio/python_version.py
 include src/python/grpcio/grpc_core_dependencies.py
 include src/python/grpcio/precompiled.py
 include src/python/grpcio/support.py
diff --git a/WORKSPACE b/WORKSPACE
index f88a7790594..675233b2eb1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -89,7 +89,7 @@ load("@com_google_protobuf//bazel:system_python.bzl", "system_python")
 
 system_python(
     name = "system_python",
-    minimum_python_version = "3.7",
+    minimum_python_version = "3.8",
 )
 
 load("@system_python//:pip.bzl", system_pip_parse = "pip_parse")
diff --git a/bazel/grpc_python_deps.bzl b/bazel/grpc_python_deps.bzl
index dbfff526a11..44eca11f671 100644
--- a/bazel/grpc_python_deps.bzl
+++ b/bazel/grpc_python_deps.bzl
@@ -38,9 +38,9 @@ def grpc_python_deps():
         http_archive(
             name = "cython",
             build_file = "@com_github_grpc_grpc//third_party:cython.BUILD",
-            sha256 = "a2da56cc22be823acf49741b9aa3aa116d4f07fa8e8b35a3cb08b8447b37c607",
-            strip_prefix = "cython-0.29.35",
+            sha256 = "2ec7d66d23d6da2328fb24f5c1bec6c63a59ec2e91027766ab904f417e1078aa",
+            strip_prefix = "cython-3.0.11",
             urls = [
-                "https://github.com/cython/cython/archive/0.29.35.tar.gz",
+                "https://github.com/cython/cython/archive/3.0.11.tar.gz",
             ],
         )
diff --git a/black.toml b/black.toml
index e655f7f8e7e..1a397fea579 100644
--- a/black.toml
+++ b/black.toml
@@ -15,6 +15,7 @@ extend-exclude = '''
   | test/cpp/naming/resolver_component_tests_runner.py  # AUTO-GENERATED
   # AUTO-GENERATED from a template:
   | grpc_version.py
+  | python_version.py
   | src/python/grpcio/grpc_core_dependencies.py
   | src/python/grpcio/grpc/_grpcio_metadata.py
   # AUTO-GENERATED BY make_grpcio_tools.py
diff --git a/build_handwritten.yaml b/build_handwritten.yaml
index 61e73166122..3c0d694d77c 100644
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@@ -16,6 +16,13 @@ settings:
   csharp_major_version: 2
   g_stands_for: groovy
   protobuf_version: 3.28.1
+  supported_python_versions:
+  - '3.8'
+  - '3.9'
+  - '3.10'
+  - '3.11'
+  - '3.12'
+  - '3.13'
   version: 1.68.0-dev
 configs:
   asan:
diff --git a/setup.py b/setup.py
index b93637215ff..48bfefe4dba 100644
--- a/setup.py
+++ b/setup.py
@@ -88,6 +88,7 @@ sys.path.insert(0, os.path.abspath(PYTHON_STEM))
 import _parallel_compile_patch
 import _spawn_patch
 import grpc_core_dependencies
+import python_version
 
 import commands
 import grpc_version
@@ -95,19 +96,21 @@ import grpc_version
 _parallel_compile_patch.monkeypatch_compile_maybe()
 _spawn_patch.monkeypatch_spawn()
 
+
 LICENSE = "Apache License 2.0"
 
-CLASSIFIERS = [
-    "Development Status :: 5 - Production/Stable",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: Apache Software License",
-]
+CLASSIFIERS = (
+    [
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+    ]
+    + [
+        f"Programming Language :: Python :: {x}"
+        for x in python_version.SUPPORTED_PYTHON_VERSIONS
+    ]
+    + ["License :: OSI Approved :: Apache Software License"]
+)
 
 
 def _env_bool_value(env_name, default):
@@ -596,7 +599,7 @@ setuptools.setup(
     packages=list(PACKAGES),
     package_dir=PACKAGE_DIRECTORIES,
     package_data=PACKAGE_DATA,
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     extras_require=EXTRAS_REQUIRES,
     setup_requires=SETUP_REQUIRES,
diff --git a/src/python/grpcio/README.rst b/src/python/grpcio/README.rst
index eb2e8a9aa59..cd529ad54f7 100644
--- a/src/python/grpcio/README.rst
+++ b/src/python/grpcio/README.rst
@@ -8,9 +8,6 @@ Package for gRPC Python.
 .. |compat_check_pypi| image:: https://python-compatibility-tools.appspot.com/one_badge_image?package=grpcio
    :target: https://python-compatibility-tools.appspot.com/one_badge_target?package=grpcio
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Installation
 ------------
diff --git a/src/python/grpcio/python_version.py b/src/python/grpcio/python_version.py
new file mode 100644
index 00000000000..4faab63465c
--- /dev/null
+++ b/src/python/grpcio/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_admin/MANIFEST.in b/src/python/grpcio_admin/MANIFEST.in
index eb7e029a4ba..3cb62658770 100644
--- a/src/python/grpcio_admin/MANIFEST.in
+++ b/src/python/grpcio_admin/MANIFEST.in
@@ -1,4 +1,5 @@
 include grpc_version.py
+include python_version.py
 recursive-include grpc_admin *.py
 global-exclude *.pyc
 include LICENSE
diff --git a/src/python/grpcio_admin/python_version.py b/src/python/grpcio_admin/python_version.py
new file mode 100644
index 00000000000..d47284cb06f
--- /dev/null
+++ b/src/python/grpcio_admin/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_admin/setup.py b/src/python/grpcio_admin/setup.py
index 4e6bdbc8dd5..30d0ca62a14 100644
--- a/src/python/grpcio_admin/setup.py
+++ b/src/python/grpcio_admin/setup.py
@@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst")
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 # Break import-style to ensure we can actually find our local modules.
+import python_version
+
 import grpc_version
 
 CLASSIFIERS = [
@@ -44,6 +46,7 @@ INSTALL_REQUIRES = (
 )
 SETUP_REQUIRES = INSTALL_REQUIRES
 
+
 setuptools.setup(
     name="grpcio-admin",
     version=grpc_version.VERSION,
@@ -56,7 +59,7 @@ setuptools.setup(
     url="https://grpc.io",
     package_dir=PACKAGE_DIRECTORIES,
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     setup_requires=SETUP_REQUIRES,
 )
diff --git a/src/python/grpcio_channelz/MANIFEST.in b/src/python/grpcio_channelz/MANIFEST.in
index 7354bef4235..14089064dce 100644
--- a/src/python/grpcio_channelz/MANIFEST.in
+++ b/src/python/grpcio_channelz/MANIFEST.in
@@ -1,4 +1,5 @@
 include grpc_version.py
+include python_version.py
 recursive-include grpc_channelz *.py *.pyi
 global-exclude *.pyc
 include LICENSE
diff --git a/src/python/grpcio_channelz/README.rst b/src/python/grpcio_channelz/README.rst
index 027c0d9e10c..26056422143 100644
--- a/src/python/grpcio_channelz/README.rst
+++ b/src/python/grpcio_channelz/README.rst
@@ -3,9 +3,6 @@ gRPC Python Channelz package
 
 Channelz is a live debug tool in gRPC Python.
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Dependencies
 ------------
diff --git a/src/python/grpcio_channelz/grpc_version.py b/src/python/grpcio_channelz/grpc_version.py
index de5e63dddcf..fff1849540e 100644
--- a/src/python/grpcio_channelz/grpc_version.py
+++ b/src/python/grpcio_channelz/grpc_version.py
@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!!
 
 VERSION = '1.68.0.dev0'
diff --git a/src/python/grpcio_channelz/python_version.py b/src/python/grpcio_channelz/python_version.py
new file mode 100644
index 00000000000..74755fdb1a9
--- /dev/null
+++ b/src/python/grpcio_channelz/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_channelz/setup.py b/src/python/grpcio_channelz/setup.py
index 034ed814829..222a0d30ca3 100644
--- a/src/python/grpcio_channelz/setup.py
+++ b/src/python/grpcio_channelz/setup.py
@@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst")
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 # Break import-style to ensure we can actually find our local modules.
+import python_version
+
 import grpc_version
 
 
@@ -44,17 +46,19 @@ class _NoOpCommand(setuptools.Command):
         pass
 
 
-CLASSIFIERS = [
-    "Development Status :: 5 - Production/Stable",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: Apache Software License",
-]
+CLASSIFIERS = (
+    [
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+    ]
+    + [
+        f"Programming Language :: Python :: {x}"
+        for x in python_version.SUPPORTED_PYTHON_VERSIONS
+    ]
+    + ["License :: OSI Approved :: Apache Software License"]
+)
+
 
 PACKAGE_DIRECTORIES = {
     "": ".",
@@ -85,6 +89,7 @@ except ImportError:
         "build_package_protos": _NoOpCommand,
     }
 
+
 setuptools.setup(
     name="grpcio-channelz",
     version=grpc_version.VERSION,
@@ -97,7 +102,7 @@ setuptools.setup(
     url="https://grpc.io",
     package_dir=PACKAGE_DIRECTORIES,
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     setup_requires=SETUP_REQUIRES,
     cmdclass=COMMAND_CLASS,
diff --git a/src/python/grpcio_csds/MANIFEST.in b/src/python/grpcio_csds/MANIFEST.in
index 4ecdf7428ed..3df9cc3cac2 100644
--- a/src/python/grpcio_csds/MANIFEST.in
+++ b/src/python/grpcio_csds/MANIFEST.in
@@ -1,4 +1,5 @@
 include grpc_version.py
+include python_version.py
 recursive-include grpc_csds *.py
 global-exclude *.pyc
 include LICENSE
diff --git a/src/python/grpcio_csds/python_version.py b/src/python/grpcio_csds/python_version.py
new file mode 100644
index 00000000000..5d9e6b076ea
--- /dev/null
+++ b/src/python/grpcio_csds/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_csds/setup.py b/src/python/grpcio_csds/setup.py
index 8fb4dab5341..1dc40333f03 100644
--- a/src/python/grpcio_csds/setup.py
+++ b/src/python/grpcio_csds/setup.py
@@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst")
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 # Break import-style to ensure we can actually find our local modules.
+import python_version
+
 import grpc_version
 
 CLASSIFIERS = [
@@ -57,7 +59,7 @@ setuptools.setup(
     url="https://grpc.io",
     package_dir=PACKAGE_DIRECTORIES,
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     setup_requires=SETUP_REQUIRES,
 )
diff --git a/src/python/grpcio_csm_observability/MANIFEST.in b/src/python/grpcio_csm_observability/MANIFEST.in
index 754eb1d7e13..afaf3464883 100644
--- a/src/python/grpcio_csm_observability/MANIFEST.in
+++ b/src/python/grpcio_csm_observability/MANIFEST.in
@@ -1,4 +1,5 @@
 graft src/python/grpcio_csm_observability/grpc_csm_observability.egg-info
 graft grpc_csm_observability
 include grpc_version.py
+include python_version.py
 include README.rst
diff --git a/src/python/grpcio_csm_observability/README.rst b/src/python/grpcio_csm_observability/README.rst
index f2c549afdb1..4725f758140 100644
--- a/src/python/grpcio_csm_observability/README.rst
+++ b/src/python/grpcio_csm_observability/README.rst
@@ -3,9 +3,6 @@ gRPC Python CSM Observability
 
 Package for gRPC Python CSM Observability.
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Installation
 ------------
diff --git a/src/python/grpcio_csm_observability/python_version.py b/src/python/grpcio_csm_observability/python_version.py
new file mode 100644
index 00000000000..4309c6a3ce0
--- /dev/null
+++ b/src/python/grpcio_csm_observability/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csm_observability/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_csm_observability/setup.py b/src/python/grpcio_csm_observability/setup.py
index c9a26db1ed5..ce4ec398a1d 100644
--- a/src/python/grpcio_csm_observability/setup.py
+++ b/src/python/grpcio_csm_observability/setup.py
@@ -22,6 +22,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst")
 # Ensure we're in the proper directory whether or not we're being used by pip.
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
+import python_version
+
 import grpc_version
 
 CLASSIFIERS = [
@@ -58,6 +60,6 @@ setuptools.setup(
     classifiers=CLASSIFIERS,
     package_dir=PACKAGE_DIRECTORIES,
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
 )
diff --git a/src/python/grpcio_health_checking/MANIFEST.in b/src/python/grpcio_health_checking/MANIFEST.in
index 6644074dc22..f68d10ad183 100644
--- a/src/python/grpcio_health_checking/MANIFEST.in
+++ b/src/python/grpcio_health_checking/MANIFEST.in
@@ -1,4 +1,5 @@
 include grpc_version.py
+include python_version.py
 recursive-include grpc_health *.py *.pyi
 global-exclude *.pyc
 include LICENSE
diff --git a/src/python/grpcio_health_checking/README.rst b/src/python/grpcio_health_checking/README.rst
index d13e671eae4..388fe3148fe 100644
--- a/src/python/grpcio_health_checking/README.rst
+++ b/src/python/grpcio_health_checking/README.rst
@@ -3,9 +3,6 @@ gRPC Python Health Checking
 
 Reference package for GRPC Python health checking.
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Dependencies
 ------------
diff --git a/src/python/grpcio_health_checking/python_version.py b/src/python/grpcio_health_checking/python_version.py
new file mode 100644
index 00000000000..96e4e2f0e06
--- /dev/null
+++ b/src/python/grpcio_health_checking/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_health_checking/setup.py b/src/python/grpcio_health_checking/setup.py
index 97a40723097..7d451e63ee6 100644
--- a/src/python/grpcio_health_checking/setup.py
+++ b/src/python/grpcio_health_checking/setup.py
@@ -24,6 +24,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst")
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 # Break import-style to ensure we can actually find our local modules.
+import python_version
+
 import grpc_version
 
 
@@ -43,17 +45,18 @@ class _NoOpCommand(setuptools.Command):
         pass
 
 
-CLASSIFIERS = [
-    "Development Status :: 5 - Production/Stable",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: Apache Software License",
-]
+CLASSIFIERS = (
+    [
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+    ]
+    + [
+        f"Programming Language :: Python :: {x}"
+        for x in python_version.SUPPORTED_PYTHON_VERSIONS
+    ]
+    + ["License :: OSI Approved :: Apache Software License"]
+)
 
 PACKAGE_DIRECTORIES = {
     "": ".",
@@ -96,7 +99,7 @@ setuptools.setup(
     classifiers=CLASSIFIERS,
     package_dir=PACKAGE_DIRECTORIES,
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     setup_requires=SETUP_REQUIRES,
     cmdclass=COMMAND_CLASS,
diff --git a/src/python/grpcio_observability/MANIFEST.in b/src/python/grpcio_observability/MANIFEST.in
index 8efdc8f6f21..ffd7f861231 100644
--- a/src/python/grpcio_observability/MANIFEST.in
+++ b/src/python/grpcio_observability/MANIFEST.in
@@ -4,5 +4,6 @@ graft grpc_root
 graft third_party
 include _parallel_compile_patch.py
 include grpc_version.py
+include python_version.py
 include observability_lib_deps.py
 include README.rst
diff --git a/src/python/grpcio_observability/README.rst b/src/python/grpcio_observability/README.rst
index 11ba92f90f5..513ebe02112 100644
--- a/src/python/grpcio_observability/README.rst
+++ b/src/python/grpcio_observability/README.rst
@@ -17,9 +17,6 @@ Note that while this approach enhances efficiency, it will introduce a slight de
 time the data is collected and the time it becomes available through Python exporters.
 
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Installation
 ------------
diff --git a/src/python/grpcio_observability/python_version.py b/src/python/grpcio_observability/python_version.py
new file mode 100644
index 00000000000..aca7367b65c
--- /dev/null
+++ b/src/python/grpcio_observability/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_observability/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_observability/setup.py b/src/python/grpcio_observability/setup.py
index 60be8deee92..1bf43a8170f 100644
--- a/src/python/grpcio_observability/setup.py
+++ b/src/python/grpcio_observability/setup.py
@@ -34,6 +34,7 @@ sys.path.insert(0, os.path.abspath("."))
 
 import _parallel_compile_patch
 import observability_lib_deps
+import python_version
 
 import grpc_version
 
@@ -287,7 +288,7 @@ setuptools.setup(
     classifiers=CLASSIFIERS,
     ext_modules=extension_modules(),
     packages=list(PACKAGES),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=[
         "grpcio=={version}".format(version=grpc_version.VERSION),
         "setuptools>=59.6.0",
diff --git a/src/python/grpcio_reflection/MANIFEST.in b/src/python/grpcio_reflection/MANIFEST.in
index eefb53d31f8..547bdd27597 100644
--- a/src/python/grpcio_reflection/MANIFEST.in
+++ b/src/python/grpcio_reflection/MANIFEST.in
@@ -1,4 +1,5 @@
 include grpc_version.py
+include python_version.py
 recursive-include grpc_reflection *.py *.pyi
 global-exclude *.pyc
 include LICENSE
diff --git a/src/python/grpcio_reflection/README.rst b/src/python/grpcio_reflection/README.rst
index b954108cc45..abb54a57f14 100644
--- a/src/python/grpcio_reflection/README.rst
+++ b/src/python/grpcio_reflection/README.rst
@@ -3,9 +3,6 @@ gRPC Python Reflection package
 
 Reference package for reflection in GRPC Python.
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Dependencies
 ------------
diff --git a/src/python/grpcio_reflection/python_version.py b/src/python/grpcio_reflection/python_version.py
new file mode 100644
index 00000000000..e94e725d14d
--- /dev/null
+++ b/src/python/grpcio_reflection/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_reflection/setup.py b/src/python/grpcio_reflection/setup.py
index fd2cd7eb872..ca7e23219fd 100644
--- a/src/python/grpcio_reflection/setup.py
+++ b/src/python/grpcio_reflection/setup.py
@@ -25,6 +25,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst")
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 # Break import-style to ensure we can actually find our local modules.
+import python_version
+
 import grpc_version
 
 
@@ -44,17 +46,18 @@ class _NoOpCommand(setuptools.Command):
         pass
 
 
-CLASSIFIERS = [
-    "Development Status :: 5 - Production/Stable",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: Apache Software License",
-]
+CLASSIFIERS = (
+    [
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+    ]
+    + [
+        f"Programming Language :: Python :: {x}"
+        for x in python_version.SUPPORTED_PYTHON_VERSIONS
+    ]
+    + ["License :: OSI Approved :: Apache Software License"]
+)
 
 PACKAGE_DIRECTORIES = {
     "": ".",
@@ -97,7 +100,7 @@ setuptools.setup(
     url="https://grpc.io",
     package_dir=PACKAGE_DIRECTORIES,
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     setup_requires=SETUP_REQUIRES,
     cmdclass=COMMAND_CLASS,
diff --git a/src/python/grpcio_status/MANIFEST.in b/src/python/grpcio_status/MANIFEST.in
index 3ecc88ec2dd..62439177f19 100644
--- a/src/python/grpcio_status/MANIFEST.in
+++ b/src/python/grpcio_status/MANIFEST.in
@@ -1,4 +1,5 @@
 include grpc_version.py
+include python_version.py
 include grpc_status/google/rpc/status.proto
 recursive-include grpc_status *.py
 global-exclude *.pyc
diff --git a/src/python/grpcio_status/README.rst b/src/python/grpcio_status/README.rst
index bfc753c799e..c2c8efcc0c7 100644
--- a/src/python/grpcio_status/README.rst
+++ b/src/python/grpcio_status/README.rst
@@ -3,9 +3,6 @@ gRPC Python Status Proto
 
 Reference package for GRPC Python status proto mapping.
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Dependencies
 ------------
diff --git a/src/python/grpcio_status/python_version.py b/src/python/grpcio_status/python_version.py
new file mode 100644
index 00000000000..02de6673e4b
--- /dev/null
+++ b/src/python/grpcio_status/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/src/python/grpcio_status/setup.py b/src/python/grpcio_status/setup.py
index f70013774c9..f98032d28b1 100644
--- a/src/python/grpcio_status/setup.py
+++ b/src/python/grpcio_status/setup.py
@@ -24,6 +24,8 @@ _README_PATH = os.path.join(_PACKAGE_PATH, "README.rst")
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 # Break import-style to ensure we can actually find our local modules.
+import python_version
+
 import grpc_version
 
 
@@ -43,17 +45,18 @@ class _NoOpCommand(setuptools.Command):
         pass
 
 
-CLASSIFIERS = [
-    "Development Status :: 5 - Production/Stable",
-    "Programming Language :: Python",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: Apache Software License",
-]
+CLASSIFIERS = (
+    [
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+    ]
+    + [
+        f"Programming Language :: Python :: {x}"
+        for x in python_version.SUPPORTED_PYTHON_VERSIONS
+    ]
+    + ["License :: OSI Approved :: Apache Software License"]
+)
 
 PACKAGE_DIRECTORIES = {
     "": ".",
@@ -93,7 +96,7 @@ setuptools.setup(
     classifiers=CLASSIFIERS,
     package_dir=PACKAGE_DIRECTORIES,
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     cmdclass=COMMAND_CLASS,
 )
diff --git a/src/python/grpcio_testing/README.rst b/src/python/grpcio_testing/README.rst
index 1b8de5dca19..34fe05be9dc 100644
--- a/src/python/grpcio_testing/README.rst
+++ b/src/python/grpcio_testing/README.rst
@@ -3,9 +3,6 @@ gRPC Python Testing Package
 
 Testing utilities for gRPC Python
 
-Supported Python Versions
--------------------------
-Python >= 3.8
 
 Dependencies
 ------------
diff --git a/templates/src/python/grpcio/python_version.py.template b/templates/src/python/grpcio/python_version.py.template
new file mode 100644
index 00000000000..8c8da439184
--- /dev/null
+++ b/templates/src/python/grpcio/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_admin/python_version.py.template b/templates/src/python/grpcio_admin/python_version.py.template
new file mode 100644
index 00000000000..d904c1d7228
--- /dev/null
+++ b/templates/src/python/grpcio_admin/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_channelz/grpc_version.py.template b/templates/src/python/grpcio_channelz/grpc_version.py.template
index 75d510cd17b..999c1025257 100644
--- a/templates/src/python/grpcio_channelz/grpc_version.py.template
+++ b/templates/src/python/grpcio_channelz/grpc_version.py.template
@@ -14,6 +14,6 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
 
-  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!!
 
   VERSION = '${settings.python_version.pep440()}'
diff --git a/templates/src/python/grpcio_channelz/python_version.py.template b/templates/src/python/grpcio_channelz/python_version.py.template
new file mode 100644
index 00000000000..e0630bb7aa1
--- /dev/null
+++ b/templates/src/python/grpcio_channelz/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_csds/python_version.py.template b/templates/src/python/grpcio_csds/python_version.py.template
new file mode 100644
index 00000000000..a5cc8627ecb
--- /dev/null
+++ b/templates/src/python/grpcio_csds/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_csm_observability/python_version.py.template b/templates/src/python/grpcio_csm_observability/python_version.py.template
new file mode 100644
index 00000000000..2aa52d73111
--- /dev/null
+++ b/templates/src/python/grpcio_csm_observability/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csm_observability/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_health_checking/python_version.py.template b/templates/src/python/grpcio_health_checking/python_version.py.template
new file mode 100644
index 00000000000..6646f69979a
--- /dev/null
+++ b/templates/src/python/grpcio_health_checking/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_observability/python_version.py.template b/templates/src/python/grpcio_observability/python_version.py.template
new file mode 100644
index 00000000000..f82b1c2d7a5
--- /dev/null
+++ b/templates/src/python/grpcio_observability/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_observability/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_reflection/python_version.py.template b/templates/src/python/grpcio_reflection/python_version.py.template
new file mode 100644
index 00000000000..29d9d47cffc
--- /dev/null
+++ b/templates/src/python/grpcio_reflection/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/src/python/grpcio_status/python_version.py.template b/templates/src/python/grpcio_status/python_version.py.template
new file mode 100644
index 00000000000..cb6aeda5a05
--- /dev/null
+++ b/templates/src/python/grpcio_status/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/tools/distrib/python/grpc_version.py.template b/templates/tools/distrib/python/grpc_version.py.template
index 5031353b871..0d36735631d 100644
--- a/templates/tools/distrib/python/grpc_version.py.template
+++ b/templates/tools/distrib/python/grpc_version.py.template
@@ -14,7 +14,7 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
 
-  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpc_version.py.template`!!!
 
   VERSION = '${settings.python_version.pep440()}'
   PROTOBUF_VERSION = '${settings.protobuf_version}'
diff --git a/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template b/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template
new file mode 100644
index 00000000000..6e06a5a4bb8
--- /dev/null
+++ b/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/tools/distrib/python/grpcio_tools/python_version.py.template b/templates/tools/distrib/python/grpcio_tools/python_version.py.template
new file mode 100644
index 00000000000..a40390110d8
--- /dev/null
+++ b/templates/tools/distrib/python/grpcio_tools/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/tools/distrib/python/xds_protos/grpc_version.py.template b/templates/tools/distrib/python/xds_protos/grpc_version.py.template
index 7808e28e219..ba301d6b865 100644
--- a/templates/tools/distrib/python/xds_protos/grpc_version.py.template
+++ b/templates/tools/distrib/python/xds_protos/grpc_version.py.template
@@ -14,7 +14,7 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
 
-  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/grpc_version.py.template`!!!
 
   VERSION = '${settings.python_version.pep440()}'
   PROTOBUF_VERSION = '${settings.protobuf_version}'
diff --git a/templates/tools/distrib/python/xds_protos/python_version.py.template b/templates/tools/distrib/python/xds_protos/python_version.py.template
new file mode 100644
index 00000000000..6f9d0562f32
--- /dev/null
+++ b/templates/tools/distrib/python/xds_protos/python_version.py.template
@@ -0,0 +1,22 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 gRPC authors.
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/python_version.py.template`!!!
+
+  SUPPORTED_PYTHON_VERSIONS = ${settings.supported_python_versions}
+
+  MIN_PYTHON_VERSION = ${settings.min_python_version}
+  MAX_PYTHON_VERSION = ${settings.max_python_version}
diff --git a/templates/tools/dockerfile/ccache_crosscompile.include b/templates/tools/dockerfile/ccache_crosscompile.include
new file mode 100644
index 00000000000..04136e01b53
--- /dev/null
+++ b/templates/tools/dockerfile/ccache_crosscompile.include
@@ -0,0 +1,14 @@
+#=================
+# Install ccache 
+
+# Install ccache from source since ccache 3.x packaged with most linux distributions
+# does not support Redis backend for caching.
+RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD STRIP OBJCOPY ${'\\'}
+    && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz ${'\\'}
+    && tar -zxf ccache.tar.gz ${'\\'}
+    && cd ccache-4.7.5 ${'\\'}
+    && mkdir build && cd build ${'\\'}
+    && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. ${'\\'}
+    && make -j4 && make install ${'\\'}
+    && cd ../.. ${'\\'}
+    && rm -rf ccache-4.7.5 ccache.tar.gz
diff --git a/templates/tools/dockerfile/compile_python_313.include b/templates/tools/dockerfile/compile_python_313.include
new file mode 100644
index 00000000000..e7d4bd38a9b
--- /dev/null
+++ b/templates/tools/dockerfile/compile_python_313.include
@@ -0,0 +1,21 @@
+#=================
+# Compile CPython 3.13.0rc2 from source
+
+RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev libsqlite3-dev && apt-get clean
+RUN apt-get update && apt-get install -y jq build-essential libffi-dev && apt-get clean
+
+RUN cd /tmp && ${'\\'}
+    wget -q https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc2.tgz && ${'\\'}
+    tar xzvf Python-3.13.0rc2.tgz && ${'\\'}
+    cd Python-3.13.0rc2 && ${'\\'}
+    ./configure && ${'\\'}
+    make -j4 && ${'\\'}
+    make install
+
+
+RUN cd /tmp && ${'\\'}
+    echo "ad7f44153649e27ec385e7633e853e03  Python-3.13.0rc2.tgz" > checksum.md5 && ${'\\'}
+    md5sum -c checksum.md5
+
+RUN python3.13 -m ensurepip && ${'\\'}
+    python3.13 -m pip install coverage
diff --git a/templates/tools/dockerfile/git_config.include b/templates/tools/dockerfile/git_config.include
new file mode 100644
index 00000000000..ad2ed5f3614
--- /dev/null
+++ b/templates/tools/dockerfile/git_config.include
@@ -0,0 +1,22 @@
+# TODO: simplify the list of third_party modules list
+# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
+# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule  
+RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares
+RUN git config --global protocol.file.allow always
\ No newline at end of file
diff --git a/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template
new file mode 100644
index 00000000000..94671a0a585
--- /dev/null
+++ b/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template
@@ -0,0 +1,57 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  
+  # The aarch64 wheels are being crosscompiled to allow running the build
+  # on x64 machine. The dockcross/linux-armv7 image is a x86_64
+  # image with crosscompilation toolchain installed
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template`!!!
+  FROM dockcross/linux-armv7
+  
+  <%text>RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev \
+                                   libnss3-dev libssl-dev libreadline-dev libffi-dev && apt-get clean</%text>
+  
+  ADD install_python_for_wheel_crosscompilation.sh /scripts/install_python_for_wheel_crosscompilation.sh
+  
+  RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.8.8" "3.8.8" /opt/python/cp38-cp38
+  RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.2" "3.9.2" /opt/python/cp39-cp39
+  RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.0" "3.10.0rc1" /opt/python/cp310-cp310
+  RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.0" "3.11.0rc1" /opt/python/cp311-cp311
+  RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.0" "3.12.0rc2" /opt/python/cp312-cp312
+  RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.0" "3.13.0rc2" /opt/python/cp313-cp313
+  
+  ENV AUDITWHEEL_ARCH armv7l
+  ENV AUDITWHEEL_PLAT linux_armv7l
+  
+  <%include file="../ccache_crosscompile.include"/>
+  
+  # The dockcross base of this image sets CC and CXX to absolute paths, which makes it impossible to redirect their invocations
+  # to ccache via a symlink. Use relative paths instead.
+  <%text>
+  ENV CC ${CROSS_TRIPLE}-gcc
+  ENV CXX ${CROSS_TRIPLE}-g++
+  </%text>
+  
+  # For historical reasons, task_runner.py the script under docker container using "bash -l"
+  # which loads /etc/profile on startup. dockcross/linux-armv7 is based on an image where
+  # /etc/profile overwrites contents of PATH (for security reasons) when run as root.
+  # That causes the crosscompiler binaries located under /usr/xcc/armv7-unknown-linux-gnueabi/bin
+  # to be removed from PATH. Since in our builds we don't need the /etc/profile for anything, we can just
+  # truncate it.
+  # TODO(jtattermusch): Remove this hack when possible.
+  RUN echo "# file contents removed to avoid resetting PATH set by the docker image" >/etc/profile
+  
+  <%include file="../git_config.include"/>
diff --git a/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template
new file mode 100644
index 00000000000..31c1be4aed5
--- /dev/null
+++ b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template
@@ -0,0 +1,28 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template`!!!
+
+  FROM dockcross/manylinux2014-aarch64:20240812-60fa1b0
+  
+  # manylinux_2_17 is the preferred alias of manylinux2014
+  ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
+  
+  <%include file="../python_pip_builds.include"/>
+  
+  <%include file="../ccache_crosscompile.include"/>
+
+  <%include file="../git_config.include"/>
diff --git a/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template
new file mode 100644
index 00000000000..cf68868594e
--- /dev/null
+++ b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template
@@ -0,0 +1,33 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  
+  # Docker file for building gRPC manylinux Python artifacts.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template`!!!
+
+  FROM quay.io/pypa/manylinux2014_x86_64:2024-09-09-f386546
+  
+  # manylinux_2_17 is the preferred alias of manylinux2014
+  ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
+  
+  # TODO(jtattermusch): revisit which of the deps are really required
+  RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel
+  
+  <%include file="../python_pip_builds.include"/>
+  
+  <%include file="../ccache.include"/>
+  
+  <%include file="../git_config.include"/>
\ No newline at end of file
diff --git a/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template
new file mode 100644
index 00000000000..d681fd47354
--- /dev/null
+++ b/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template
@@ -0,0 +1,34 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  
+  # Docker file for building gRPC manylinux Python artifacts.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template`!!!  
+
+  FROM quay.io/pypa/manylinux2014_i686:2024-09-09-f386546
+  
+  # manylinux_2_17 is the preferred alias of manylinux2014
+  ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
+  
+  # TODO(jtattermusch): revisit which of the deps are really required
+  RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel
+  
+  <%include file="../python_pip_builds.include"/>
+  
+  <%include file="../ccache.include"/>
+  
+  
+  <%include file="../git_config.include"/>
\ No newline at end of file
diff --git a/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template
new file mode 100644
index 00000000000..dfb62902711
--- /dev/null
+++ b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template
@@ -0,0 +1,27 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template`!!!
+  
+  FROM quay.io/pypa/musllinux_1_1_x86_64:2024-09-09-f386546
+  
+  <%include file="../python_pip_builds.include"/>
+  
+  <%include file="../ccache.include"/>
+  
+  <%include file="../git_config.include"/>
+
+  RUN apk add openssl openssl-dev
\ No newline at end of file
diff --git a/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template
new file mode 100644
index 00000000000..6f7ca5a52a8
--- /dev/null
+++ b/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template
@@ -0,0 +1,25 @@
+%YAML 1.2
+--- |
+  # Copyright 2024 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template`!!!
+  
+  FROM quay.io/pypa/musllinux_1_1_i686:2024-09-09-f386546
+  
+  <%include file="../python_pip_builds.include"/>
+  
+  <%include file="../ccache.include"/>
+  
+  <%include file="../git_config.include"/>
diff --git a/templates/tools/dockerfile/python_pip_builds.include b/templates/tools/dockerfile/python_pip_builds.include
new file mode 100644
index 00000000000..e573a063338
--- /dev/null
+++ b/templates/tools/dockerfile/python_pip_builds.include
@@ -0,0 +1,8 @@
+#===================================
+# Install Python build requirements
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1'
\ No newline at end of file
diff --git a/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template
index 0981763f21d..a385ec8d602 100644
--- a/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_debian11_default_x64/Dockerfile.template
@@ -24,6 +24,7 @@
   <%include file="../../compile_python_310.include"/>
   <%include file="../../compile_python_311.include"/>
   <%include file="../../compile_python_312.include"/>
+  <%include file="../../compile_python_313.include"/>
 
   # Python test coverage requires libsqlite3, and it have
   # to be installed before Python.
diff --git a/test/distrib/bazel/python/WORKSPACE b/test/distrib/bazel/python/WORKSPACE
index 3567f8a2ac0..b56055fa741 100644
--- a/test/distrib/bazel/python/WORKSPACE
+++ b/test/distrib/bazel/python/WORKSPACE
@@ -29,7 +29,7 @@ load("@com_google_protobuf//bazel:system_python.bzl", "system_python")
 
 system_python(
     name = "system_python",
-    minimum_python_version = "3.7",
+    minimum_python_version = "3.8",
 )
 
 load("@system_python//:pip.bzl", "pip_parse")
diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl
index 5a349762058..973a649dfe5 100644
--- a/tools/bazelify_tests/dockerimage_current_versions.bzl
+++ b/tools/bazelify_tests/dockerimage_current_versions.bzl
@@ -63,12 +63,12 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
     "tools/dockerfile/grpc_artifact_centos6_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_centos6_x64@sha256:3285047265ea2b7c5d4df4c769b2d05f56288d947c75e16d27ae2dee693f791b",
     "tools/dockerfile/grpc_artifact_centos6_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_centos6_x86@sha256:19783239da92208f0f39cf563529cd02e889920497ef81c60d20391fa998af62",
     "tools/dockerfile/grpc_artifact_protoc_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_protoc_aarch64@sha256:a0f6b544c1b2fa75f73b26cb28281917153304e9df2789e93de0732494e6b651",
-    "tools/dockerfile/grpc_artifact_python_linux_armv7.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7@sha256:f109d6c22cadb053f6843a66ee827d74f34d6cbf75a32f455a9da099ed1bdc9c",
-    "tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64@sha256:3f0407d4db904b35a7665c2222db039994cd0c9bdb1a073a653ff8e6940081c9",
-    "tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64@sha256:89329900ec7fedc57cd89690acd34d07d726f6b896f60df987867737d0a0f5a8",
-    "tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86@sha256:8fce8e094b00935dc1f2640b4c2b10216c5a8711c0f4444efbafcd8c355a75a8",
-    "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64@sha256:c8e8eb24942a2910197cf5481d61e7cbce68b57bd6f35fae878b043b1f2c38bb",
-    "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86@sha256:c288f83435186ee675d004ee52c93195a51201bf2b5fe92581584d977a2499a3",
+    "tools/dockerfile/grpc_artifact_python_linux_armv7.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7@sha256:137616275fe59bf89849f7503779f9a5d9668dbf395fcc79a8221a8c38fa5bac",
+    "tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64@sha256:ad3233be3c3ad9e0c4b60f0176a853713a35e5c84ec9d9703996c67fa3e811b6",
+    "tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64@sha256:0e102df67f31aeb6afe68250603288c2f1c98ccf360d1c42d751b8451da94b48",
+    "tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86@sha256:527e2e9ec4db0c52a53b50abfd59907a1b7e221168dc401686f6a48d33bddc5c",
+    "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64@sha256:94b57e5ea31ebc29af734474bcaff3074770778e5d27557cdc06d755ee8bc7ed",
+    "tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86@sha256:edf4a0c8333c9309e52f323aa7315bbc0e5643216613cab4ecd2bce3d1ec26c0",
     "tools/dockerfile/interoptest/grpc_interop_aspnetcore.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_aspnetcore@sha256:8e2e732e78724a8382c340dca72e7653c5f82c251a3110fa2874cc00ba538878",
     "tools/dockerfile/interoptest/grpc_interop_cxx.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_cxx@sha256:e5a474d33773d52ec6a8abbe2d61ee0c2a9c2b5f48793a5ea3b82c4445becf3f",
     "tools/dockerfile/interoptest/grpc_interop_dart.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_dart@sha256:4915a280788126dad029858eb384dbbef2dc18cadccb434df6450dfd7a4929f2",
@@ -109,7 +109,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
     "tools/dockerfile/test/php7_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian11_x64@sha256:34b02fd66832ebf49601bef95632753e6710a75755401c21332d50056ccd52d2",
     "tools/dockerfile/test/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:0a4e3c166fb676d85ea26d9fffec3858d59a2f243a3acc1c2f9bd293a590a98c",
     "tools/dockerfile/test/python_debian11_default_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_arm64@sha256:fccca33a655c7aa89dd7ebd9492cbcc1f636bd2a004cd939d1982cfce3d68326",
-    "tools/dockerfile/test/python_debian11_default_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64@sha256:4c539fc93d343324309939c2964204c90f4054cd9eeed093af315cb0f0ef7c26",
+    "tools/dockerfile/test/python_debian11_default_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64@sha256:8beca964d6bbb80a8cb4c4628c25e9702b007c97113e74e589fa50c15000738d",
     "tools/dockerfile/test/rbe_ubuntu2004.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_ubuntu2004@sha256:b3eb1a17b7b091e3c5648a803076b2c40601242ff91c04d55997af6641305f68",
     "tools/dockerfile/test/ruby_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_arm64@sha256:d2e79919b2e2d4cc36a29682ecb5170641df4fb506cfb453978ffdeb8a841bd9",
     "tools/dockerfile/test/ruby_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian11_x64@sha256:6e8b4696ba0661f11a31ed0992a94d2efcd889a018f57160f0e2fb62963f3593",
diff --git a/tools/bazelify_tests/test/BUILD b/tools/bazelify_tests/test/BUILD
index 4aefd22e325..dee1d5172aa 100644
--- a/tools/bazelify_tests/test/BUILD
+++ b/tools/bazelify_tests/test/BUILD
@@ -269,8 +269,8 @@ grpc_build_artifact_task(
 # Python artifact build tasks
 
 grpc_build_artifact_task(
-    name = "artifact_python_linux_x64_manylinux2014_cp312",
-    build_script = "build_artifact_python_linux_x64_cp312.sh",
+    name = "artifact_python_linux_x64_manylinux2014_cp313",
+    build_script = "build_artifact_python_linux_x64_cp313.sh",
     docker_image_version = "tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version",
 )
 
@@ -287,7 +287,7 @@ grpc_build_artifact_task(
     name = "package_python_linux",
     # TODO(jtattermusch): add more python artifacts once they are migrated from artifact_targets.py
     artifact_deps = [
-        "artifact_python_linux_x64_manylinux2014_cp312",
+        "artifact_python_linux_x64_manylinux2014_cp313",
         "artifact_python_linux_x64_manylinux2014_cp39",
     ],
     build_script = "build_package_python_linux.sh",
@@ -421,7 +421,7 @@ test_suite(
         ":artifact_protoc_linux_aarch64_build_test",
         ":artifact_protoc_linux_x64_build_test",
         ":artifact_protoc_linux_x86_build_test",
-        ":artifact_python_linux_x64_manylinux2014_cp312_build_test",
+        ":artifact_python_linux_x64_manylinux2014_cp313_build_test",
         ":artifact_python_linux_x64_manylinux2014_cp39_build_test",
         ":package_csharp_linux_build_test",
         ":package_python_linux_build_test",
diff --git a/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp312.sh b/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp313.sh
similarity index 93%
rename from tools/bazelify_tests/test/build_artifact_python_linux_x64_cp312.sh
rename to tools/bazelify_tests/test/build_artifact_python_linux_x64_cp313.sh
index 8604176c82e..d8a0b6b2ec2 100755
--- a/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp312.sh
+++ b/tools/bazelify_tests/test/build_artifact_python_linux_x64_cp313.sh
@@ -17,8 +17,8 @@ set -ex
 
 # env variable values extracted from PythonArtifact in tools/run_tests/artifacts/artifact_targets.py
 # TODO(jtattermusch): find a better way of configuring the python artifact build (the current approach mostly serves as a demonstration)
-export PYTHON=/opt/python/cp312-cp312/bin/python
-export PIP=/opt/python/cp312-cp312/bin/pip
+export PYTHON=/opt/python/cp313-cp313/bin/python
+export PIP=/opt/python/cp313-cp313/bin/pip
 export GRPC_SKIP_PIP_CYTHON_UPGRADE=TRUE
 export GRPC_RUN_AUDITWHEEL_REPAIR=TRUE
 export GRPC_BUILD_GRPCIO_TOOLS_DEPENDENTS=TRUE
diff --git a/tools/buildgen/plugins/expand_supported_python_versions.py b/tools/buildgen/plugins/expand_supported_python_versions.py
new file mode 100644
index 00000000000..8cc4e814d74
--- /dev/null
+++ b/tools/buildgen/plugins/expand_supported_python_versions.py
@@ -0,0 +1,33 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Buildgen python version plugin
+
+This parses the list of supported python versions from the yaml build file, and 
+creates custom strings for the minimum and maximum supported python versions.
+
+"""
+
+
+def mako_plugin(dictionary):
+    """Expand version numbers:
+    - for each language, ensure there's a language_version tag in
+      settings (defaulting to the master version tag)
+    - expand version strings to major, minor, patch, and tag
+    """
+
+    settings = dictionary["settings"]
+
+    supported_python_versions = settings["supported_python_versions"]
+    settings["min_python_version"] = supported_python_versions[0]
+    settings["max_python_version"] = supported_python_versions[-1]
diff --git a/tools/distrib/install_all_python_modules.sh b/tools/distrib/install_all_python_modules.sh
index b23b38cc624..ab5823b9553 100755
--- a/tools/distrib/install_all_python_modules.sh
+++ b/tools/distrib/install_all_python_modules.sh
@@ -59,4 +59,3 @@ pushd src/python;
     popd;
   done
 popd;
-
diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py
index 8cec1e10eca..28f793690ef 100644
--- a/tools/distrib/python/grpc_version.py
+++ b/tools/distrib/python/grpc_version.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpc_version.py.template`!!!
 
 VERSION = '1.68.0.dev0'
 PROTOBUF_VERSION = '3.28.1'
diff --git a/tools/distrib/python/grpcio_tools/MANIFEST.in b/tools/distrib/python/grpcio_tools/MANIFEST.in
index 1393de652a8..e74fde44b91 100644
--- a/tools/distrib/python/grpcio_tools/MANIFEST.in
+++ b/tools/distrib/python/grpcio_tools/MANIFEST.in
@@ -1,10 +1,12 @@
 include _parallel_compile_patch.py
 include _spawn_patch.py
 include grpc_version.py
+include python_version.py
 include protoc_deps.py
 include protoc_lib_deps.py
 include README.rst
 include grpc_tools/grpc_version.py
+include grpc_tools/python_version.py
 graft grpc_tools
 graft grpc_root
 graft third_party
diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py b/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py
new file mode 100644
index 00000000000..0dcc71c1fda
--- /dev/null
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_tools/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/tools/distrib/python/grpcio_tools/python_version.py b/tools/distrib/python/grpcio_tools/python_version.py
new file mode 100644
index 00000000000..fc59f030fbb
--- /dev/null
+++ b/tools/distrib/python/grpcio_tools/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py
index d0173a61658..5e19b6314ed 100644
--- a/tools/distrib/python/grpcio_tools/setup.py
+++ b/tools/distrib/python/grpcio_tools/setup.py
@@ -39,6 +39,7 @@ sys.path.insert(0, os.path.abspath("."))
 import _parallel_compile_patch
 import _spawn_patch
 import protoc_lib_deps
+import python_version
 
 import grpc_version
 
@@ -329,7 +330,7 @@ setuptools.setup(
     classifiers=CLASSIFIERS,
     ext_modules=extension_modules(),
     packages=setuptools.find_packages("."),
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=[
         "protobuf>=5.26.1,<6.0dev",
         "grpcio>={version}".format(version=grpc_version.VERSION),
diff --git a/tools/distrib/python/xds_protos/MANIFEST.in b/tools/distrib/python/xds_protos/MANIFEST.in
index d83c49b9186..3fea17ba661 100644
--- a/tools/distrib/python/xds_protos/MANIFEST.in
+++ b/tools/distrib/python/xds_protos/MANIFEST.in
@@ -1 +1,2 @@
 include grpc_version.py
+include python_version.py
\ No newline at end of file
diff --git a/tools/distrib/python/xds_protos/grpc_version.py b/tools/distrib/python/xds_protos/grpc_version.py
index 7add68a0e24..170b505959b 100644
--- a/tools/distrib/python/xds_protos/grpc_version.py
+++ b/tools/distrib/python/xds_protos/grpc_version.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/grpc_version.py.template`!!!
 
 VERSION = '1.68.0.dev0'
 PROTOBUF_VERSION = '3.28.1'
diff --git a/tools/distrib/python/xds_protos/python_version.py b/tools/distrib/python/xds_protos/python_version.py
new file mode 100644
index 00000000000..80cce2eb4c5
--- /dev/null
+++ b/tools/distrib/python/xds_protos/python_version.py
@@ -0,0 +1,20 @@
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/xds_protos/python_version.py.template`!!!
+
+SUPPORTED_PYTHON_VERSIONS = ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+
+MIN_PYTHON_VERSION = 3.8
+MAX_PYTHON_VERSION = 3.13
diff --git a/tools/distrib/python/xds_protos/setup.py b/tools/distrib/python/xds_protos/setup.py
index f1c7247cc4b..53a6fbdfecb 100644
--- a/tools/distrib/python/xds_protos/setup.py
+++ b/tools/distrib/python/xds_protos/setup.py
@@ -19,6 +19,7 @@ import os
 import setuptools
 
 import grpc_version
+import python_version
 
 WORK_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -44,6 +45,7 @@ INSTALL_REQUIRES = [
 
 SETUP_REQUIRES = INSTALL_REQUIRES + ["grpcio-tools>=1.49.0"]
 
+
 setuptools.setup(
     name="xds-protos",
     version=grpc_version.VERSION,
@@ -55,7 +57,7 @@ setuptools.setup(
     author_email="grpc-io@googlegroups.com",
     url="https://grpc.io",
     license="Apache License 2.0",
-    python_requires=">=3.8",
+    python_requires=f">={python_version.MIN_PYTHON_VERSION}",
     install_requires=INSTALL_REQUIRES,
     setup_requires=SETUP_REQUIRES,
     classifiers=CLASSIFIERS,
diff --git a/tools/dockerfile/README.md b/tools/dockerfile/README.md
index 89c599d6079..fbdc872f70f 100644
--- a/tools/dockerfile/README.md
+++ b/tools/dockerfile/README.md
@@ -37,6 +37,7 @@ If you've made modifications to a dockerfile, you can upload the new version of
 registry as follows:
 
 If you haven't configured authentication in Docker for us-docker.pkg.dev previously, run:
+
 ```
 gcloud auth configure-docker us-docker.pkg.dev
 gcloud auth login
@@ -45,6 +46,7 @@ gcloud auth login
 Rebuild the docker images that have been modified locally and upload the docker images to
 artifact registry (note that this won't overwrite the "old" versions of the docker image
 that are already in artifact registry)
+
 ```
 # Install qemu, binformat, and configure binfmt interpreters
 sudo apt-get install binfmt-support qemu-user-static
@@ -58,6 +60,7 @@ tools/dockerfile/push_testing_images.sh
 Build modified docker images locally and don't push to artifact registry. This option is
 very useful for quick local experiments. The script is much faster if it doesn't have to
 interact with artifact registry:
+
 ```
 # very useful for local experiments
 LOCAL_ONLY_MODE=true tools/dockerfile/push_testing_images.sh
@@ -69,6 +72,7 @@ In the past, our testing docker images were [hosted on dockerhub](https://hub.do
 but we are in the process of migrating them artifact registry now.
 
 This temporary feature might simplify the migration:
+
 ```
 # try pull existing images from dockerhub instead of building the from scratch locally.
 TRANSFER_FROM_DOCKERHUB=true tools/dockerfile/push_testing_images.sh
diff --git a/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version b/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version
index 2ddbcc9ba32..0a992570421 100644
--- a/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version
+++ b/tools/dockerfile/grpc_artifact_python_linux_armv7.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7:0b87638ab97b433c6818be5124dcd89d479b3a8b@sha256:f109d6c22cadb053f6843a66ee827d74f34d6cbf75a32f455a9da099ed1bdc9c
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_linux_armv7:3523bf4a67fa9100deb8f48ee4833cb5a5e97697@sha256:137616275fe59bf89849f7503779f9a5d9668dbf395fcc79a8221a8c38fa5bac
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile b/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile
index 40a22e6fe54..03aacb23b49 100644
--- a/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2020 The gRPC Authors
+# Copyright 2024 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # The aarch64 wheels are being crosscompiled to allow running the build
 # on x64 machine. The dockcross/linux-armv7 image is a x86_64
 # image with crosscompilation toolchain installed
+
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_linux_armv7/Dockerfile.template`!!!
 FROM dockcross/linux-armv7
 
 RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev \
@@ -22,37 +24,39 @@ RUN apt update && apt install -y build-essential zlib1g-dev libncurses5-dev libg
 
 ADD install_python_for_wheel_crosscompilation.sh /scripts/install_python_for_wheel_crosscompilation.sh
 
-RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.6.13" "3.6.13" /opt/python/cp36-cp36m
-RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.7.10" "3.7.10" /opt/python/cp37-cp37m
 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.8.8" "3.8.8" /opt/python/cp38-cp38
 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.9.2" "3.9.2" /opt/python/cp39-cp39
 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.10.0" "3.10.0rc1" /opt/python/cp310-cp310
 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.11.0" "3.11.0rc1" /opt/python/cp311-cp311
 RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.12.0" "3.12.0rc2" /opt/python/cp312-cp312
+RUN /scripts/install_python_for_wheel_crosscompilation.sh "3.13.0" "3.13.0rc2" /opt/python/cp313-cp313
 
 ENV AUDITWHEEL_ARCH armv7l
 ENV AUDITWHEEL_PLAT linux_armv7l
 
 #=================
-# Install ccache
+# Install ccache 
 
 # Install ccache from source since ccache 3.x packaged with most linux distributions
 # does not support Redis backend for caching.
-RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD \
-    && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
+RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD STRIP OBJCOPY \
+    && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \
     && tar -zxf ccache.tar.gz \
-    && cd ccache-4.5.1 \
+    && cd ccache-4.7.5 \
     && mkdir build && cd build \
     && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
     && make -j4 && make install \
     && cd ../.. \
-    && rm -rf ccache-4.5.1 ccache.tar.gz
+    && rm -rf ccache-4.7.5 ccache.tar.gz
+
 
 # The dockcross base of this image sets CC and CXX to absolute paths, which makes it impossible to redirect their invocations
 # to ccache via a symlink. Use relative paths instead.
+
 ENV CC ${CROSS_TRIPLE}-gcc
 ENV CXX ${CROSS_TRIPLE}-g++
 
+
 # For historical reasons, task_runner.py the script under docker container using "bash -l"
 # which loads /etc/profile on startup. dockcross/linux-armv7 is based on an image where
 # /etc/profile overwrites contents of PATH (for security reasons) when run as root.
@@ -62,5 +66,25 @@ ENV CXX ${CROSS_TRIPLE}-g++
 # TODO(jtattermusch): Remove this hack when possible.
 RUN echo "# file contents removed to avoid resetting PATH set by the docker image" >/etc/profile
 
+# TODO: simplify the list of third_party modules list
+# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
+# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule  
 RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares
 RUN git config --global protocol.file.allow always
diff --git a/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh b/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh
index 08c6439d36a..f1f1d39509e 100755
--- a/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh
+++ b/tools/dockerfile/grpc_artifact_python_linux_armv7/install_python_for_wheel_crosscompilation.sh
@@ -44,4 +44,4 @@ popd
 rm -rf "Python-${PYTHON_VERSION}"
 
 # install cython and wheel
-"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade 'cython<3.0.0rc1' wheel
+"${PYTHON_PREFIX}/bin/python3" -m pip install --upgrade 'cython<4.0.0rc1' wheel
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version
index cdce8e543b4..cf67b251907 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:cfc9fe0cb36bb4ec8425982fd7f07e4e14bf3941@sha256:3f0407d4db904b35a7665c2222db039994cd0c9bdb1a073a653ff8e6940081c9
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_aarch64:377f694f92dd1b56dff0b0a0f47d6e731200953c@sha256:ad3233be3c3ad9e0c4b60f0176a853713a35e5c84ec9d9703996c67fa3e811b6
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile
index 8e1c0751a8a..e4c3f8f306c 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2020 The gRPC Authors
+# Copyright 2024 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,35 +12,57 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM dockcross/manylinux2014-aarch64:20230905-7b2d74f
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_aarch64/Dockerfile.template`!!!
+
+FROM dockcross/manylinux2014-aarch64:20240812-60fa1b0
 
 # manylinux_2_17 is the preferred alias of manylinux2014
 ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
 
-###################################
+#===================================
 # Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1'
 
 #=================
-# Install ccache
+# Install ccache 
 
 # Install ccache from source since ccache 3.x packaged with most linux distributions
 # does not support Redis backend for caching.
 RUN unset CMAKE_TOOLCHAIN_FILE && unset AS AR CC CPP CXX LD STRIP OBJCOPY \
-    && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
+    && curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \
     && tar -zxf ccache.tar.gz \
-    && cd ccache-4.5.1 \
+    && cd ccache-4.7.5 \
     && mkdir build && cd build \
     && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
     && make -j4 && make install \
     && cd ../.. \
-    && rm -rf ccache-4.5.1 ccache.tar.gz
+    && rm -rf ccache-4.7.5 ccache.tar.gz
+
 
+# TODO: simplify the list of third_party modules list
+# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
+# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule  
 RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares
 RUN git config --global protocol.file.allow always
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version
index c6f58ea8034..b99340a7285 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:e81af0c6d454929785e8126fc993cbd93da5c014@sha256:89329900ec7fedc57cd89690acd34d07d726f6b896f60df987867737d0a0f5a8
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x64:379c3240e9fd68b7c13a3b6cb24307a272558494@sha256:0e102df67f31aeb6afe68250603288c2f1c98ccf360d1c42d751b8451da94b48
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile
index ae959de2db4..ea75ed3af7c 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2020 The gRPC Authors
+# Copyright 2024 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,9 @@
 
 # Docker file for building gRPC manylinux Python artifacts.
 
-FROM quay.io/pypa/manylinux2014_x86_64:2023-09-17-ae90a16
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x64/Dockerfile.template`!!!
+
+FROM quay.io/pypa/manylinux2014_x86_64:2024-09-09-f386546
 
 # manylinux_2_17 is the preferred alias of manylinux2014
 ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
@@ -22,29 +24,49 @@ ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
 # TODO(jtattermusch): revisit which of the deps are really required
 RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel
 
-###################################
+#===================================
 # Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1'
 
 #=================
 # Install ccache
 
 # Install ccache from source since ccache 3.x packaged with most linux distributions
 # does not support Redis backend for caching.
-RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
+RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \
     && tar -zxf ccache.tar.gz \
-    && cd ccache-4.5.1 \
+    && cd ccache-4.7.5 \
     && mkdir build && cd build \
     && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
     && make -j4 && make install \
     && cd ../.. \
-    && rm -rf ccache-4.5.1 ccache.tar.gz
+    && rm -rf ccache-4.7.5 ccache.tar.gz
+
 
+# TODO: simplify the list of third_party modules list
+# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
+# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule  
 RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares
 RUN git config --global protocol.file.allow always
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version
index efbb3c35dbe..67a5533afbd 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:fda00560d600eed356f8d6bef2cc8416d0a6b790@sha256:8fce8e094b00935dc1f2640b4c2b10216c5a8711c0f4444efbafcd8c355a75a8
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_manylinux2014_x86:28eec3c9e027fd42f5852f696ed3e47aec91229b@sha256:527e2e9ec4db0c52a53b50abfd59907a1b7e221168dc401686f6a48d33bddc5c
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile
index 7736403f098..3ffa2f46bbb 100644
--- a/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2020 The gRPC Authors
+# Copyright 2024 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,9 @@
 
 # Docker file for building gRPC manylinux Python artifacts.
 
-FROM quay.io/pypa/manylinux2014_i686:2023-09-17-ae90a16
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_manylinux2014_x86/Dockerfile.template`!!!  
+
+FROM quay.io/pypa/manylinux2014_i686:2024-09-09-f386546
 
 # manylinux_2_17 is the preferred alias of manylinux2014
 ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
@@ -22,30 +24,50 @@ ENV AUDITWHEEL_PLAT manylinux_2_17_$AUDITWHEEL_ARCH
 # TODO(jtattermusch): revisit which of the deps are really required
 RUN yum update -y && yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel
 
-###################################
+#===================================
 # Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1'
 
 #=================
 # Install ccache
 
 # Install ccache from source since ccache 3.x packaged with most linux distributions
 # does not support Redis backend for caching.
-RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
+RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \
     && tar -zxf ccache.tar.gz \
-    && cd ccache-4.5.1 \
+    && cd ccache-4.7.5 \
     && mkdir build && cd build \
     && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
     && make -j4 && make install \
     && cd ../.. \
-    && rm -rf ccache-4.5.1 ccache.tar.gz
+    && rm -rf ccache-4.7.5 ccache.tar.gz
+
 
 
+# TODO: simplify the list of third_party modules list
+# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
+# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule  
 RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares
 RUN git config --global protocol.file.allow always
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version
index 5365ea4a4be..af23ed31a5c 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:2f56fcee2e4964359dddcd57bb9b066ceb8331ec@sha256:c8e8eb24942a2910197cf5481d61e7cbce68b57bd6f35fae878b043b1f2c38bb
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x64:1bc8405880fdad2b22f8a6422cd6198b0b54838a@sha256:94b57e5ea31ebc29af734474bcaff3074770778e5d27557cdc06d755ee8bc7ed
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile
index a6eff9bbe71..dc16c9133b7 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021 The gRPC Authors
+# Copyright 2024 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,31 +12,55 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/pypa/musllinux_1_1_x86_64:2023-09-17-ae90a16
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x64/Dockerfile.template`!!!
 
-###################################
+FROM quay.io/pypa/musllinux_1_1_x86_64:2024-09-09-f386546
+
+#===================================
 # Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1'
 
 #=================
 # Install ccache
 
 # Install ccache from source since ccache 3.x packaged with most linux distributions
 # does not support Redis backend for caching.
-RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
+RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \
     && tar -zxf ccache.tar.gz \
-    && cd ccache-4.5.1 \
+    && cd ccache-4.7.5 \
     && mkdir build && cd build \
     && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
     && make -j4 && make install \
     && cd ../.. \
-    && rm -rf ccache-4.5.1 ccache.tar.gz
+    && rm -rf ccache-4.7.5 ccache.tar.gz
+
 
+# TODO: simplify the list of third_party modules list
+# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
+# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule  
 RUN git config --global --add safe.directory /var/local/jenkins/grpc
-RUN git config --global protocol.file.allow always
\ No newline at end of file
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares
+RUN git config --global protocol.file.allow always
+
+RUN apk add openssl openssl-dev
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version
index c30b39b356a..ba2e0cac19a 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:9308dccacd76fb1782a43d97e6f5062b5b58576d@sha256:c288f83435186ee675d004ee52c93195a51201bf2b5fe92581584d977a2499a3
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_python_musllinux_1_1_x86:358044420e0991fe284f49848145d5145cff42ac@sha256:edf4a0c8333c9309e52f323aa7315bbc0e5643216613cab4ecd2bce3d1ec26c0
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile
index c7ac549e98f..6509ab15003 100644
--- a/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2021 The gRPC Authors
+# Copyright 2024 The gRPC Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,31 +12,53 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/pypa/musllinux_1_1_i686:2023-09-17-ae90a16
+# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/dockerfile/grpc_artifact_python_musllinux_1_1_x86/Dockerfile.template`!!!
 
-###################################
+FROM quay.io/pypa/musllinux_1_1_i686:2024-09-09-f386546
+
+#===================================
 # Install Python build requirements
-RUN /opt/python/cp36-cp36m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp37-cp37m/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<3.0.0rc1'
-RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<3.0.0rc1'
+RUN /opt/python/cp38-cp38/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp39-cp39/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp310-cp310/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp311-cp311/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp312-cp312/bin/pip install --upgrade 'cython<4.0.0rc1'
+RUN /opt/python/cp313-cp313/bin/pip install --upgrade 'cython<4.0.0rc1'
 
 #=================
 # Install ccache
 
 # Install ccache from source since ccache 3.x packaged with most linux distributions
 # does not support Redis backend for caching.
-RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.gz \
+RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \
     && tar -zxf ccache.tar.gz \
-    && cd ccache-4.5.1 \
+    && cd ccache-4.7.5 \
     && mkdir build && cd build \
     && cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \
     && make -j4 && make install \
     && cd ../.. \
-    && rm -rf ccache-4.5.1 ccache.tar.gz
+    && rm -rf ccache-4.7.5 ccache.tar.gz
+
 
+# TODO: simplify the list of third_party modules list
+# NOTE: git>=2.46 allows leading paths like third_party/* to include all subdirectories
+# current docker base images use git versions lower than 2.46 and hence require separate configs for each submodule  
 RUN git config --global --add safe.directory /var/local/jenkins/grpc
-RUN git config --global protocol.file.allow always
\ No newline at end of file
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/bloaty
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/xds
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googleapis
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/googletest
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opencensus-proto
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/boringssl-with-bazel
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/envoy-api
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protobuf
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/zlib
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/benchmark
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/re2
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/abseil-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/opentelemetry-cpp
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/protoc-gen-validate
+RUN git config --global --add safe.directory /var/local/jenkins/grpc/.git/modules/third_party/cares/cares
+RUN git config --global protocol.file.allow always
diff --git a/tools/dockerfile/test/python_debian11_default_x64.current_version b/tools/dockerfile/test/python_debian11_default_x64.current_version
index 70b0383e90a..8b82524dba6 100644
--- a/tools/dockerfile/test/python_debian11_default_x64.current_version
+++ b/tools/dockerfile/test/python_debian11_default_x64.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64:05951fbd0e77e8ba072d270ad08f0d4b6ac00841@sha256:4c539fc93d343324309939c2964204c90f4054cd9eeed093af315cb0f0ef7c26
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64:224d8dc6c8287ee247378888ac93b9fe9e36ec8c@sha256:8beca964d6bbb80a8cb4c4628c25e9702b007c97113e74e589fa50c15000738d
\ No newline at end of file
diff --git a/tools/dockerfile/test/python_debian11_default_x64/Dockerfile b/tools/dockerfile/test/python_debian11_default_x64/Dockerfile
index 2ba17722bce..e7c2c9a658d 100644
--- a/tools/dockerfile/test/python_debian11_default_x64/Dockerfile
+++ b/tools/dockerfile/test/python_debian11_default_x64/Dockerfile
@@ -173,6 +173,28 @@ RUN cd /tmp && \
 RUN python3.12 -m ensurepip && \
     python3.12 -m pip install coverage
 
+#=================
+# Compile CPython 3.13.0rc2 from source
+
+RUN apt-get update && apt-get install -y zlib1g-dev libssl-dev libsqlite3-dev && apt-get clean
+RUN apt-get update && apt-get install -y jq build-essential libffi-dev && apt-get clean
+
+RUN cd /tmp && \
+    wget -q https://www.python.org/ftp/python/3.13.0/Python-3.13.0rc2.tgz && \
+    tar xzvf Python-3.13.0rc2.tgz && \
+    cd Python-3.13.0rc2 && \
+    ./configure && \
+    make -j4 && \
+    make install
+
+
+RUN cd /tmp && \
+    echo "ad7f44153649e27ec385e7633e853e03  Python-3.13.0rc2.tgz" > checksum.md5 && \
+    md5sum -c checksum.md5
+
+RUN python3.13 -m ensurepip && \
+    python3.13 -m pip install coverage
+
 
 # Python test coverage requires libsqlite3, and it have
 # to be installed before Python.
diff --git a/tools/internal_ci/helper_scripts/install_python_interpreters.ps1 b/tools/internal_ci/helper_scripts/install_python_interpreters.ps1
index 902fa3b0965..ddeaad711f8 100644
--- a/tools/internal_ci/helper_scripts/install_python_interpreters.ps1
+++ b/tools/internal_ci/helper_scripts/install_python_interpreters.ps1
@@ -149,3 +149,20 @@ $Python312x64Config = @{
     PythonInstallerHash = "ea1993b5227fa4c8f45a06f5fbdd23b3"
 }
 Install-Python @Python312x64Config
+
+# Python 3.13
+$Python313x86Config = @{
+    PythonVersion = "3.13.0"
+    PythonInstaller = "python-3.13.0rc2"
+    PythonInstallPath = "C:\Python313_32bit"
+    PythonInstallerHash = "647f429b5584d9ee2dd02fdc9c61a38e"
+}
+Install-Python @Python313x86Config
+
+$Python313x64Config = @{
+    PythonVersion = "3.13.0"
+    PythonInstaller = "python-3.13.0rc2-amd64"
+    PythonInstallPath = "C:\Python313"
+    PythonInstallerHash = "0af5ad8734962267323ef45f384de3aa"
+}
+Install-Python @Python313x64Config
\ No newline at end of file
diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
index 8b3de1ab8ff..1cfd4cba7ce 100644
--- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc
+++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
@@ -176,6 +176,14 @@ then
     shasum -c /tmp/python_installer_checksum.sha256
     time sudo installer -pkg ./python-3.12.0rc2-macos11.pkg -target /
   fi
+
+  # Install Python 3.13 if it doesn't exist
+  if [ ! -f "/usr/local/bin/python3.13" ]; then
+    time curl -O https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg
+    echo "75579065f9ee5c25207353fbe0f79275123ff556  python-3.13.0rc2-macos11.pkg" > /tmp/python_installer_checksum.sha256
+    shasum -c /tmp/python_installer_checksum.sha256
+    time sudo installer -pkg ./python-3.13.0rc2-macos11.pkg -target /
+  fi
 fi
 
 if [ "${PREPARE_BUILD_INSTALL_DEPS_CSHARP}" == "true" ]
diff --git a/tools/internal_ci/helper_scripts/requirements.macos.txt b/tools/internal_ci/helper_scripts/requirements.macos.txt
index 59a759b0ce2..57c4fb7abf5 100644
--- a/tools/internal_ci/helper_scripts/requirements.macos.txt
+++ b/tools/internal_ci/helper_scripts/requirements.macos.txt
@@ -1,4 +1,4 @@
-cython<3.0.0rc1
+cython<4.0.0rc1
 cryptography==3.4.6
 PyJWT==2.0.1
 pyOpenSSL==20.0.1
diff --git a/tools/internal_ci/macos/grpc_distribtests_python.sh b/tools/internal_ci/macos/grpc_distribtests_python.sh
index 8bd18de2e1d..fa651af4e8a 100644
--- a/tools/internal_ci/macos/grpc_distribtests_python.sh
+++ b/tools/internal_ci/macos/grpc_distribtests_python.sh
@@ -26,12 +26,12 @@ source tools/internal_ci/helper_scripts/prepare_build_macos_rc
 
 # TODO(jtattermusch): cleanup this prepare build step (needed for python artifact build)
 # install cython for all python versions
-python3.7 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user
-python3.8 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user
-python3.9 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user
-python3.10 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user
-python3.11 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user
-python3.12 -m pip install -U 'cython<3.0.0rc1' setuptools==65.4.1 wheel --user
+python3.8 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user
+python3.9 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user
+python3.10 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user
+python3.11 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user
+python3.12 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user
+python3.13 -m pip install -U 'cython<4.0.0rc1' setuptools==65.4.1 wheel --user
 
 # Build all python macos artifacts (this step actually builds all the binary wheels and source archives)
 tools/run_tests/task_runner.py -f artifact macos python ${TASK_RUNNER_EXTRA_FILTERS} -j 2 -x build_artifacts/sponge_log.xml || FAILED="true"
diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py
index 3146af9266a..6f00c17fa03 100644
--- a/tools/run_tests/artifacts/artifact_targets.py
+++ b/tools/run_tests/artifacts/artifact_targets.py
@@ -165,6 +165,7 @@ class PythonArtifact:
         elif "manylinux" in self.platform:
             if self.arch == "x86":
                 environ["SETARCH_CMD"] = "linux32"
+                environ["GRPC_SKIP_TWINE_CHECK"] = "TRUE"
             # Inside the manylinux container, the python installations are located in
             # special places...
             environ["PYTHON"] = "/opt/python/{}/bin/python".format(
@@ -201,6 +202,10 @@ class PythonArtifact:
             environ["GRPC_SKIP_PIP_CYTHON_UPGRADE"] = "TRUE"
             environ["GRPC_RUN_AUDITWHEEL_REPAIR"] = "TRUE"
             environ["GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX"] = "TRUE"
+
+            if self.arch == "x86":
+                environ["GRPC_SKIP_TWINE_CHECK"] = "TRUE"
+
             return create_docker_jobspec(
                 self.name,
                 "tools/dockerfile/grpc_artifact_python_%s_%s"
@@ -401,15 +406,17 @@ def targets():
             PythonArtifact("manylinux2014", "x64", "cp39-cp39", presubmit=True),
             PythonArtifact("manylinux2014", "x64", "cp310-cp310"),
             PythonArtifact("manylinux2014", "x64", "cp311-cp311"),
+            PythonArtifact("manylinux2014", "x64", "cp312-cp312"),
             PythonArtifact(
-                "manylinux2014", "x64", "cp312-cp312", presubmit=True
+                "manylinux2014", "x64", "cp313-cp313", presubmit=True
             ),
             PythonArtifact("manylinux2014", "x86", "cp38-cp38", presubmit=True),
             PythonArtifact("manylinux2014", "x86", "cp39-cp39", presubmit=True),
             PythonArtifact("manylinux2014", "x86", "cp310-cp310"),
             PythonArtifact("manylinux2014", "x86", "cp311-cp311"),
+            PythonArtifact("manylinux2014", "x86", "cp312-cp312"),
             PythonArtifact(
-                "manylinux2014", "x86", "cp312-cp312", presubmit=True
+                "manylinux2014", "x86", "cp313-cp313", presubmit=True
             ),
             PythonArtifact(
                 "manylinux2014", "aarch64", "cp38-cp38", presubmit=True
@@ -417,45 +424,52 @@ def targets():
             PythonArtifact("manylinux2014", "aarch64", "cp39-cp39"),
             PythonArtifact("manylinux2014", "aarch64", "cp310-cp310"),
             PythonArtifact("manylinux2014", "aarch64", "cp311-cp311"),
+            PythonArtifact("manylinux2014", "aarch64", "cp312-cp312"),
             PythonArtifact(
-                "manylinux2014", "aarch64", "cp312-cp312", presubmit=True
+                "manylinux2014", "aarch64", "cp313-cp313", presubmit=True
             ),
             PythonArtifact("linux_extra", "armv7", "cp38-cp38", presubmit=True),
             PythonArtifact("linux_extra", "armv7", "cp39-cp39"),
             PythonArtifact("linux_extra", "armv7", "cp310-cp310"),
             PythonArtifact("linux_extra", "armv7", "cp311-cp311"),
+            PythonArtifact("linux_extra", "armv7", "cp312-cp312"),
             PythonArtifact(
-                "linux_extra", "armv7", "cp312-cp312", presubmit=True
+                "linux_extra", "armv7", "cp313-cp313", presubmit=True
             ),
             PythonArtifact("musllinux_1_1", "x64", "cp38-cp38", presubmit=True),
             PythonArtifact("musllinux_1_1", "x64", "cp39-cp39"),
             PythonArtifact("musllinux_1_1", "x64", "cp310-cp310"),
             PythonArtifact("musllinux_1_1", "x64", "cp311-cp311"),
+            PythonArtifact("musllinux_1_1", "x64", "cp312-cp312"),
             PythonArtifact(
-                "musllinux_1_1", "x64", "cp312-cp312", presubmit=True
+                "musllinux_1_1", "x64", "cp313-cp313", presubmit=True
             ),
             PythonArtifact("musllinux_1_1", "x86", "cp38-cp38", presubmit=True),
             PythonArtifact("musllinux_1_1", "x86", "cp39-cp39"),
             PythonArtifact("musllinux_1_1", "x86", "cp310-cp310"),
             PythonArtifact("musllinux_1_1", "x86", "cp311-cp311"),
+            PythonArtifact("musllinux_1_1", "x86", "cp312-cp312"),
             PythonArtifact(
-                "musllinux_1_1", "x86", "cp312-cp312", presubmit=True
+                "musllinux_1_1", "x86", "cp313-cp313", presubmit=True
             ),
             PythonArtifact("macos", "x64", "python3.8", presubmit=True),
             PythonArtifact("macos", "x64", "python3.9"),
             PythonArtifact("macos", "x64", "python3.10"),
             PythonArtifact("macos", "x64", "python3.11"),
-            PythonArtifact("macos", "x64", "python3.12", presubmit=True),
+            PythonArtifact("macos", "x64", "python3.12"),
+            PythonArtifact("macos", "x64", "python3.13", presubmit=True),
             PythonArtifact("windows", "x86", "Python38_32bit", presubmit=True),
             PythonArtifact("windows", "x86", "Python39_32bit"),
             PythonArtifact("windows", "x86", "Python310_32bit"),
             PythonArtifact("windows", "x86", "Python311_32bit"),
-            PythonArtifact("windows", "x86", "Python312_32bit", presubmit=True),
+            PythonArtifact("windows", "x86", "Python312_32bit"),
+            PythonArtifact("windows", "x86", "Python313_32bit", presubmit=True),
             PythonArtifact("windows", "x64", "Python38", presubmit=True),
             PythonArtifact("windows", "x64", "Python39"),
             PythonArtifact("windows", "x64", "Python310"),
             PythonArtifact("windows", "x64", "Python311"),
-            PythonArtifact("windows", "x64", "Python312", presubmit=True),
+            PythonArtifact("windows", "x64", "Python312"),
+            PythonArtifact("windows", "x64", "Python313", presubmit=True),
             RubyArtifact("linux", "x86-mingw32", presubmit=True),
             RubyArtifact("linux", "x64-mingw32", presubmit=True),
             RubyArtifact("linux", "x64-mingw-ucrt", presubmit=True),
diff --git a/tools/run_tests/artifacts/build_artifact_python.bat b/tools/run_tests/artifacts/build_artifact_python.bat
index ee17381bc1b..4ac49183af4 100644
--- a/tools/run_tests/artifacts/build_artifact_python.bat
+++ b/tools/run_tests/artifacts/build_artifact_python.bat
@@ -56,7 +56,7 @@ python setup.py bdist_wheel || goto :error
 popd
 
 @rem Ensure the generate artifacts are valid.
-python -m pip install packaging==21.3 twine==3.8.0
+python -m pip install packaging==21.3 twine==5.0.0
 python -m twine check dist\* tools\distrib\python\grpcio_tools\dist\* || goto :error
 
 xcopy /Y /I /S dist\* %ARTIFACT_DIR% || goto :error
diff --git a/tools/run_tests/artifacts/build_artifact_python.sh b/tools/run_tests/artifacts/build_artifact_python.sh
index 1598d2edc18..b00ae1e372c 100755
--- a/tools/run_tests/artifacts/build_artifact_python.sh
+++ b/tools/run_tests/artifacts/build_artifact_python.sh
@@ -39,7 +39,7 @@ then
   # Any installation step is a potential source of breakages,
   # so we are trying to perform as few download-and-install operations
   # as possible.
-  "${PYTHON}" -m pip install --upgrade 'cython<3.0.0rc1'
+  "${PYTHON}" -m pip install --upgrade 'cython<4.0.0rc1'
 fi
 
 # Allow build_ext to build C/C++ files in parallel
@@ -167,7 +167,8 @@ then
   "${PYTHON}" -m pip install virtualenv
   "${PYTHON}" -m virtualenv venv || { "${PYTHON}" -m pip install virtualenv==20.0.23 && "${PYTHON}" -m virtualenv venv; }
   # Ensure the generated artifacts are valid using "twine check"
-  venv/bin/python -m pip install "twine<=2.0" "readme_renderer<40.0"
+  # pinning twine's dependency package `cryptography` version to 3.3.2 (last version without Rust dependency)
+  venv/bin/python -m pip install "cryptography==3.3.2" "twine==5.0.0" "readme_renderer<40.0"
   venv/bin/python -m twine check dist/* tools/distrib/python/grpcio_tools/dist/*
   if [ "$GRPC_BUILD_MAC" == "" ]; then
     venv/bin/python -m twine check src/python/grpcio_observability/dist/*
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 16f05533882..90073bb8e2c 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -844,6 +844,13 @@ class PythonLanguage(object):
             bits=bits,
             config_vars=config_vars,
         )
+        python313_config = _python_config_generator(
+            name="py313",
+            major="3",
+            minor="13",
+            bits=bits,
+            config_vars=config_vars,
+        )
         pypy27_config = _pypy_config_generator(
             name="pypy", major="2", config_vars=config_vars
         )
@@ -880,6 +887,8 @@ class PythonLanguage(object):
             return (python311_config,)
         elif args.compiler == "python3.12":
             return (python312_config,)
+        elif args.compiler == "python3.13":
+            return (python313_config,)
         elif args.compiler == "pypy":
             return (pypy27_config,)
         elif args.compiler == "pypy3":
@@ -893,6 +902,7 @@ class PythonLanguage(object):
                 python310_config,
                 python311_config,
                 python312_config,
+                python313_config,
             )
         else:
             raise Exception("Compiler %s not supported." % args.compiler)

From f6f13ccaec188339a69d96b91186c15b217d3e0c Mon Sep 17 00:00:00 2001
From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com>
Date: Thu, 26 Sep 2024 10:37:01 -0700
Subject: [PATCH 02/74] [PH2][Refactor][internal.h] Split file. Add
 stream_lists.h  (#37775)

Moving out related code into a separate file.
`internal.h -> stream_lists.h`

Closes #37775

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37775 from tanvi-jagtap:ph2_stream_lists_h 13b6030cebcf00abecf1f010e21773490c6d08d2
PiperOrigin-RevId: 679205824
---
 BUILD                                         |  1 +
 Package.swift                                 |  1 +
 build_autogenerated.yaml                      |  2 +
 gRPC-C++.podspec                              |  2 +
 gRPC-Core.podspec                             |  2 +
 grpc.gemspec                                  |  1 +
 package.xml                                   |  1 +
 .../chttp2/transport/chttp2_transport.cc      |  1 +
 .../chttp2/transport/frame_window_update.cc   |  1 +
 .../ext/transport/chttp2/transport/internal.h | 41 ------------
 .../chttp2/transport/stream_lists.cc          |  2 +
 .../transport/chttp2/transport/stream_lists.h | 65 +++++++++++++++++++
 .../ext/transport/chttp2/transport/writing.cc |  1 +
 tools/doxygen/Doxyfile.c++.internal           |  1 +
 tools/doxygen/Doxyfile.core.internal          |  1 +
 15 files changed, 82 insertions(+), 41 deletions(-)
 create mode 100644 src/core/ext/transport/chttp2/transport/stream_lists.h

diff --git a/BUILD b/BUILD
index 093cddb95af..36c3c47497f 100644
--- a/BUILD
+++ b/BUILD
@@ -4779,6 +4779,7 @@ grpc_cc_library(
         "//src/core:ext/transport/chttp2/transport/frame_settings.h",
         "//src/core:ext/transport/chttp2/transport/frame_window_update.h",
         "//src/core:ext/transport/chttp2/transport/internal.h",
+        "//src/core:ext/transport/chttp2/transport/stream_lists.h",
     ],
     external_deps = [
         "absl/base:core_headers",
diff --git a/Package.swift b/Package.swift
index d9411aed0ec..988f1e7abe7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -256,6 +256,7 @@ let package = Package(
         "src/core/ext/transport/chttp2/transport/ping_rate_policy.cc",
         "src/core/ext/transport/chttp2/transport/ping_rate_policy.h",
         "src/core/ext/transport/chttp2/transport/stream_lists.cc",
+        "src/core/ext/transport/chttp2/transport/stream_lists.h",
         "src/core/ext/transport/chttp2/transport/varint.cc",
         "src/core/ext/transport/chttp2/transport/varint.h",
         "src/core/ext/transport/chttp2/transport/write_size_policy.cc",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index bc395b7e0e4..e7c5b7684c3 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -291,6 +291,7 @@ libs:
   - src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
   - src/core/ext/transport/chttp2/transport/ping_callbacks.h
   - src/core/ext/transport/chttp2/transport/ping_rate_policy.h
+  - src/core/ext/transport/chttp2/transport/stream_lists.h
   - src/core/ext/transport/chttp2/transport/varint.h
   - src/core/ext/transport/chttp2/transport/write_size_policy.h
   - src/core/ext/transport/inproc/inproc_transport.h
@@ -2313,6 +2314,7 @@ libs:
   - src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
   - src/core/ext/transport/chttp2/transport/ping_callbacks.h
   - src/core/ext/transport/chttp2/transport/ping_rate_policy.h
+  - src/core/ext/transport/chttp2/transport/stream_lists.h
   - src/core/ext/transport/chttp2/transport/varint.h
   - src/core/ext/transport/chttp2/transport/write_size_policy.h
   - src/core/ext/transport/inproc/inproc_transport.h
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 4862b8ee10e..9d37c6cbe39 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -380,6 +380,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h',
                       'src/core/ext/transport/chttp2/transport/ping_callbacks.h',
                       'src/core/ext/transport/chttp2/transport/ping_rate_policy.h',
+                      'src/core/ext/transport/chttp2/transport/stream_lists.h',
                       'src/core/ext/transport/chttp2/transport/varint.h',
                       'src/core/ext/transport/chttp2/transport/write_size_policy.h',
                       'src/core/ext/transport/inproc/inproc_transport.h',
@@ -1681,6 +1682,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h',
                               'src/core/ext/transport/chttp2/transport/ping_callbacks.h',
                               'src/core/ext/transport/chttp2/transport/ping_rate_policy.h',
+                              'src/core/ext/transport/chttp2/transport/stream_lists.h',
                               'src/core/ext/transport/chttp2/transport/varint.h',
                               'src/core/ext/transport/chttp2/transport/write_size_policy.h',
                               'src/core/ext/transport/inproc/inproc_transport.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index f953ca34e73..15080faf737 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -376,6 +376,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/chttp2/transport/ping_rate_policy.cc',
                       'src/core/ext/transport/chttp2/transport/ping_rate_policy.h',
                       'src/core/ext/transport/chttp2/transport/stream_lists.cc',
+                      'src/core/ext/transport/chttp2/transport/stream_lists.h',
                       'src/core/ext/transport/chttp2/transport/varint.cc',
                       'src/core/ext/transport/chttp2/transport/varint.h',
                       'src/core/ext/transport/chttp2/transport/write_size_policy.cc',
@@ -2467,6 +2468,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/transport/chttp2/transport/ping_abuse_policy.h',
                               'src/core/ext/transport/chttp2/transport/ping_callbacks.h',
                               'src/core/ext/transport/chttp2/transport/ping_rate_policy.h',
+                              'src/core/ext/transport/chttp2/transport/stream_lists.h',
                               'src/core/ext/transport/chttp2/transport/varint.h',
                               'src/core/ext/transport/chttp2/transport/write_size_policy.h',
                               'src/core/ext/transport/inproc/inproc_transport.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 83b134b50fe..f7829369b0e 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -262,6 +262,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/transport/chttp2/transport/ping_rate_policy.cc )
   s.files += %w( src/core/ext/transport/chttp2/transport/ping_rate_policy.h )
   s.files += %w( src/core/ext/transport/chttp2/transport/stream_lists.cc )
+  s.files += %w( src/core/ext/transport/chttp2/transport/stream_lists.h )
   s.files += %w( src/core/ext/transport/chttp2/transport/varint.cc )
   s.files += %w( src/core/ext/transport/chttp2/transport/varint.h )
   s.files += %w( src/core/ext/transport/chttp2/transport/write_size_policy.cc )
diff --git a/package.xml b/package.xml
index 67c1e56e75a..4bd5a7a2f8c 100644
--- a/package.xml
+++ b/package.xml
@@ -244,6 +244,7 @@
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/ping_rate_policy.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/ping_rate_policy.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/stream_lists.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/stream_lists.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/varint.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/varint.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/write_size_policy.cc" role="src" />
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 02fffbf41ca..fef7fb92d0b 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -68,6 +68,7 @@
 #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h"
 #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h"
 #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h"
+#include "src/core/ext/transport/chttp2/transport/stream_lists.h"
 #include "src/core/ext/transport/chttp2/transport/varint.h"
 #include "src/core/ext/transport/chttp2/transport/write_size_policy.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
index 6dafd5318b2..20cddebd5ca 100644
--- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
@@ -29,6 +29,7 @@
 
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
+#include "src/core/ext/transport/chttp2/transport/stream_lists.h"
 
 grpc_slice grpc_chttp2_window_update_create(
     uint32_t id, uint32_t window_delta,
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index 80e214ca1f2..bdbbd6890c7 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -769,47 +769,6 @@ absl::variant<size_t, absl::Status> grpc_chttp2_perform_read(
     grpc_chttp2_transport* t, const grpc_slice& slice,
     size_t& requests_started);
 
-bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t,
-                                          grpc_chttp2_stream* s);
-/// Get a writable stream
-/// returns non-zero if there was a stream available
-bool grpc_chttp2_list_pop_writable_stream(grpc_chttp2_transport* t,
-                                          grpc_chttp2_stream** s);
-bool grpc_chttp2_list_remove_writable_stream(grpc_chttp2_transport* t,
-                                             grpc_chttp2_stream* s);
-
-bool grpc_chttp2_list_add_writing_stream(grpc_chttp2_transport* t,
-                                         grpc_chttp2_stream* s);
-bool grpc_chttp2_list_have_writing_streams(grpc_chttp2_transport* t);
-bool grpc_chttp2_list_pop_writing_stream(grpc_chttp2_transport* t,
-                                         grpc_chttp2_stream** s);
-
-void grpc_chttp2_list_add_written_stream(grpc_chttp2_transport* t,
-                                         grpc_chttp2_stream* s);
-bool grpc_chttp2_list_pop_written_stream(grpc_chttp2_transport* t,
-                                         grpc_chttp2_stream** s);
-
-void grpc_chttp2_list_add_waiting_for_concurrency(grpc_chttp2_transport* t,
-                                                  grpc_chttp2_stream* s);
-bool grpc_chttp2_list_pop_waiting_for_concurrency(grpc_chttp2_transport* t,
-                                                  grpc_chttp2_stream** s);
-void grpc_chttp2_list_remove_waiting_for_concurrency(grpc_chttp2_transport* t,
-                                                     grpc_chttp2_stream* s);
-
-void grpc_chttp2_list_add_stalled_by_transport(grpc_chttp2_transport* t,
-                                               grpc_chttp2_stream* s);
-bool grpc_chttp2_list_pop_stalled_by_transport(grpc_chttp2_transport* t,
-                                               grpc_chttp2_stream** s);
-void grpc_chttp2_list_remove_stalled_by_transport(grpc_chttp2_transport* t,
-                                                  grpc_chttp2_stream* s);
-
-void grpc_chttp2_list_add_stalled_by_stream(grpc_chttp2_transport* t,
-                                            grpc_chttp2_stream* s);
-bool grpc_chttp2_list_pop_stalled_by_stream(grpc_chttp2_transport* t,
-                                            grpc_chttp2_stream** s);
-bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t,
-                                               grpc_chttp2_stream* s);
-
 //******** Flow Control **************
 
 // Takes in a flow control action and performs all the needed operations.
diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc
index f4ee3e58eb8..14039a614b7 100644
--- a/src/core/ext/transport/chttp2/transport/stream_lists.cc
+++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include "src/core/ext/transport/chttp2/transport/stream_lists.h"
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.h b/src/core/ext/transport/chttp2/transport/stream_lists.h
new file mode 100644
index 00000000000..f415fe73704
--- /dev/null
+++ b/src/core/ext/transport/chttp2/transport/stream_lists.h
@@ -0,0 +1,65 @@
+//
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_LISTS_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_LISTS_H
+
+#include "src/core/ext/transport/chttp2/transport/internal.h"
+
+bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t,
+                                          grpc_chttp2_stream* s);
+/// Get a writable stream
+/// returns non-zero if there was a stream available
+bool grpc_chttp2_list_pop_writable_stream(grpc_chttp2_transport* t,
+                                          grpc_chttp2_stream** s);
+bool grpc_chttp2_list_remove_writable_stream(grpc_chttp2_transport* t,
+                                             grpc_chttp2_stream* s);
+
+bool grpc_chttp2_list_add_writing_stream(grpc_chttp2_transport* t,
+                                         grpc_chttp2_stream* s);
+bool grpc_chttp2_list_have_writing_streams(grpc_chttp2_transport* t);
+bool grpc_chttp2_list_pop_writing_stream(grpc_chttp2_transport* t,
+                                         grpc_chttp2_stream** s);
+
+void grpc_chttp2_list_add_written_stream(grpc_chttp2_transport* t,
+                                         grpc_chttp2_stream* s);
+bool grpc_chttp2_list_pop_written_stream(grpc_chttp2_transport* t,
+                                         grpc_chttp2_stream** s);
+
+void grpc_chttp2_list_add_waiting_for_concurrency(grpc_chttp2_transport* t,
+                                                  grpc_chttp2_stream* s);
+bool grpc_chttp2_list_pop_waiting_for_concurrency(grpc_chttp2_transport* t,
+                                                  grpc_chttp2_stream** s);
+void grpc_chttp2_list_remove_waiting_for_concurrency(grpc_chttp2_transport* t,
+                                                     grpc_chttp2_stream* s);
+
+void grpc_chttp2_list_add_stalled_by_transport(grpc_chttp2_transport* t,
+                                               grpc_chttp2_stream* s);
+bool grpc_chttp2_list_pop_stalled_by_transport(grpc_chttp2_transport* t,
+                                               grpc_chttp2_stream** s);
+void grpc_chttp2_list_remove_stalled_by_transport(grpc_chttp2_transport* t,
+                                                  grpc_chttp2_stream* s);
+
+void grpc_chttp2_list_add_stalled_by_stream(grpc_chttp2_transport* t,
+                                            grpc_chttp2_stream* s);
+bool grpc_chttp2_list_pop_stalled_by_stream(grpc_chttp2_transport* t,
+                                            grpc_chttp2_stream** s);
+bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t,
+                                               grpc_chttp2_stream* s);
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_STREAM_LISTS_H
diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc
index 13797c1f1b5..d5678956f51 100644
--- a/src/core/ext/transport/chttp2/transport/writing.cc
+++ b/src/core/ext/transport/chttp2/transport/writing.cc
@@ -51,6 +51,7 @@
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h"
 #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h"
+#include "src/core/ext/transport/chttp2/transport/stream_lists.h"
 #include "src/core/ext/transport/chttp2/transport/write_size_policy.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 3688a568841..994e038c983 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1267,6 +1267,7 @@ src/core/ext/transport/chttp2/transport/ping_callbacks.h \
 src/core/ext/transport/chttp2/transport/ping_rate_policy.cc \
 src/core/ext/transport/chttp2/transport/ping_rate_policy.h \
 src/core/ext/transport/chttp2/transport/stream_lists.cc \
+src/core/ext/transport/chttp2/transport/stream_lists.h \
 src/core/ext/transport/chttp2/transport/varint.cc \
 src/core/ext/transport/chttp2/transport/varint.h \
 src/core/ext/transport/chttp2/transport/write_size_policy.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 9b118d61fd8..3725bd86978 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1034,6 +1034,7 @@ src/core/ext/transport/chttp2/transport/ping_callbacks.h \
 src/core/ext/transport/chttp2/transport/ping_rate_policy.cc \
 src/core/ext/transport/chttp2/transport/ping_rate_policy.h \
 src/core/ext/transport/chttp2/transport/stream_lists.cc \
+src/core/ext/transport/chttp2/transport/stream_lists.h \
 src/core/ext/transport/chttp2/transport/varint.cc \
 src/core/ext/transport/chttp2/transport/varint.h \
 src/core/ext/transport/chttp2/transport/write_size_policy.cc \

From 2030231e3227c1c5b6b11ae1013a2374e6be6b7d Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 26 Sep 2024 12:06:32 -0700
Subject: [PATCH 03/74] [gcc7] Build fix (#37796)

Closes #37796

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37796 from ctiller:buildy 363eca118abf339899a8114019027d579747385e
PiperOrigin-RevId: 679243010
---
 src/core/call/request_buffer.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/call/request_buffer.cc b/src/core/call/request_buffer.cc
index 257743cbb90..ee0878603c0 100644
--- a/src/core/call/request_buffer.cc
+++ b/src/core/call/request_buffer.cc
@@ -117,7 +117,7 @@ RequestBuffer::Reader::PollPullClientInitialMetadata() {
     pulled_client_initial_metadata_ = true;
     auto result = ClaimObject(buffering->initial_metadata);
     buffer_->MaybeSwitchToStreaming();
-    return result;
+    return std::move(result);
   }
   if (auto* buffered = absl::get_if<Buffered>(&buffer_->state_)) {
     pulled_client_initial_metadata_ = true;
@@ -142,7 +142,7 @@ RequestBuffer::Reader::PollPullMessage() {
     auto result = ClaimObject(buffering->messages[idx]);
     ++message_index_;
     buffer_->MaybeSwitchToStreaming();
-    return result;
+    return std::move(result);
   }
   if (auto* buffered = absl::get_if<Buffered>(&buffer_->state_)) {
     if (message_index_ == buffered->messages.size()) return absl::nullopt;
@@ -159,7 +159,7 @@ RequestBuffer::Reader::PollPullMessage() {
     auto waker = std::move(buffer_->push_waker_);
     lock.Release();
     waker.Wakeup();
-    return msg;
+    return std::move(msg);
   }
   error_ = absl::get<Cancelled>(buffer_->state_).error;
   return Failure{};

From 992b3aea8aaaa1285ed74f0ff3e3843765d1e197 Mon Sep 17 00:00:00 2001
From: Sourabh Singh <sourabhsinghs@google.com>
Date: Fri, 27 Sep 2024 08:41:13 -0700
Subject: [PATCH 04/74] remove logging_threshold tests (#37806)

Closes #37806

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37806 from sourabhsinghs:unittest/logging-threshold d501d38dc0c487fe2019fd4b0db6b61d831df45f
PiperOrigin-RevId: 679604228
---
 bazel/internal_python_rules.bzl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bazel/internal_python_rules.bzl b/bazel/internal_python_rules.bzl
index a6c4e18ef81..b2a506c6ae4 100644
--- a/bazel/internal_python_rules.bzl
+++ b/bazel/internal_python_rules.bzl
@@ -14,7 +14,6 @@
 """Python-related rules intended only for use internal to the repo."""
 
 load("//bazel:gevent_test.bzl", "py_grpc_gevent_test")
-load("//bazel:logging_threshold_test.bzl", "py_grpc_logging_threshold_test")
 
 def internal_py_grpc_test(name, **kwargs):
     """Runs a test under all supported environments.
@@ -29,7 +28,6 @@ def internal_py_grpc_test(name, **kwargs):
         **kwargs
     )
     py_grpc_gevent_test(name, **kwargs)
-    py_grpc_logging_threshold_test(name, **kwargs)
 
     suite_kwargs = {}
     if "visibility" in kwargs:
@@ -40,7 +38,6 @@ def internal_py_grpc_test(name, **kwargs):
         tests = [
             name + ".native",
             name + ".gevent",
-            name + ".logging_threshold",
         ],
         **suite_kwargs
     )

From f2e3636303a66408cc67b61e8660cc51e9c1fbb3 Mon Sep 17 00:00:00 2001
From: Sreenithi Sridharan <19sreenithi98@gmail.com>
Date: Fri, 27 Sep 2024 08:53:41 -0700
Subject: [PATCH 05/74] increased timeout for armv7 artifact build to 2 hours
 (#37807)

Building armv7 artifacts after adding Python 3.13 is failing with a timeout. Hence increasing timeout to 2 hours.

Closes #37807

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37807 from sreenithi:increase_armv7_artifact_build_timeout 60034378f585e7a7af5de8879fe32a04c9a3ccaa
PiperOrigin-RevId: 679608393
---
 tools/run_tests/artifacts/artifact_targets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py
index 6f00c17fa03..2695500eae8 100644
--- a/tools/run_tests/artifacts/artifact_targets.py
+++ b/tools/run_tests/artifacts/artifact_targets.py
@@ -160,7 +160,7 @@ class PythonArtifact:
                 ),
                 "tools/run_tests/artifacts/build_artifact_python.sh",
                 environ=environ,
-                timeout_seconds=60 * 60,
+                timeout_seconds=60 * 60 * 2,
             )
         elif "manylinux" in self.platform:
             if self.arch == "x86":

From 6ba3b4a71764c4a837cbfff3072b60d5e8d32f76 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 27 Sep 2024 10:39:05 -0700
Subject: [PATCH 06/74] [xDS] ORCA to LRS propagation changes (#37467)

Implements gRFC A85 (https://github.com/grpc/proposal/pull/454).

Closes #37467

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37467 from markdroth:orca_lrs_propagation_changes 0c1e889bb70b422899bda04166524c678d628c70
PiperOrigin-RevId: 679646192
---
 BUILD                                         |   2 +
 CMakeLists.txt                                |   1 +
 Makefile                                      |   1 +
 Package.swift                                 |   2 +
 build_autogenerated.yaml                      |   2 +
 config.m4                                     |   1 +
 config.w32                                    |   1 +
 gRPC-C++.podspec                              |   2 +
 gRPC-Core.podspec                             |   3 +
 grpc.gemspec                                  |   2 +
 package.xml                                   |   2 +
 src/core/BUILD                                |  24 ++
 .../load_balancing/xds/xds_cluster_impl.cc    |  13 +-
 src/core/xds/grpc/xds_cluster.cc              |   5 +
 src/core/xds/grpc/xds_cluster.h               |  15 +
 src/core/xds/grpc/xds_cluster_parser.cc       |  27 ++
 src/core/xds/xds_client/lrs_client.cc         | 145 ++++++--
 src/core/xds/xds_client/lrs_client.h          |  63 +++-
 .../xds_backend_metric_propagation.cc         |  64 ++++
 .../xds_backend_metric_propagation.h          |  60 ++++
 src/proto/grpc/testing/xds/v3/cluster.proto   |  15 +
 .../grpc/testing/xds/v3/load_report.proto     |  25 +-
 src/python/grpcio/grpc_core_dependencies.py   |   1 +
 .../xds/xds_cluster_resource_type_test.cc     |  88 ++++-
 .../end2end/xds/xds_cluster_end2end_test.cc   | 319 ++++++++++++++++++
 test/cpp/end2end/xds/xds_end2end_test_lib.h   |  12 +
 test/cpp/end2end/xds/xds_server.h             |  30 +-
 tools/doxygen/Doxyfile.c++.internal           |   2 +
 tools/doxygen/Doxyfile.core.internal          |   2 +
 29 files changed, 872 insertions(+), 57 deletions(-)
 create mode 100644 src/core/xds/xds_client/xds_backend_metric_propagation.cc
 create mode 100644 src/core/xds/xds_client/xds_backend_metric_propagation.h

diff --git a/BUILD b/BUILD
index 36c3c47497f..17b278b61e6 100644
--- a/BUILD
+++ b/BUILD
@@ -4462,6 +4462,7 @@ grpc_cc_library(
         "//src/core:default_event_engine",
         "//src/core:dual_ref_counted",
         "//src/core:env",
+        "//src/core:grpc_backend_metric_data",
         "//src/core:json",
         "//src/core:per_cpu",
         "//src/core:ref_counted",
@@ -4469,6 +4470,7 @@ grpc_cc_library(
         "//src/core:time",
         "//src/core:upb_utils",
         "//src/core:useful",
+        "//src/core:xds_backend_metric_propagation",
     ],
 )
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14bceea8d0b..3836f7beac9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2665,6 +2665,7 @@ add_library(grpc
   src/core/xds/grpc/xds_transport_grpc.cc
   src/core/xds/xds_client/lrs_client.cc
   src/core/xds/xds_client/xds_api.cc
+  src/core/xds/xds_client/xds_backend_metric_propagation.cc
   src/core/xds/xds_client/xds_bootstrap.cc
   src/core/xds/xds_client/xds_client.cc
 )
diff --git a/Makefile b/Makefile
index 08ae5d181c1..70828125ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -1517,6 +1517,7 @@ LIBGRPC_SRC = \
     src/core/xds/grpc/xds_transport_grpc.cc \
     src/core/xds/xds_client/lrs_client.cc \
     src/core/xds/xds_client/xds_api.cc \
+    src/core/xds/xds_client/xds_backend_metric_propagation.cc \
     src/core/xds/xds_client/xds_bootstrap.cc \
     src/core/xds/xds_client/xds_client.cc \
     third_party/abseil-cpp/absl/base/internal/cycleclock.cc \
diff --git a/Package.swift b/Package.swift
index 988f1e7abe7..8b1ae1392cc 100644
--- a/Package.swift
+++ b/Package.swift
@@ -2036,6 +2036,8 @@ let package = Package(
         "src/core/xds/xds_client/lrs_client.h",
         "src/core/xds/xds_client/xds_api.cc",
         "src/core/xds/xds_client/xds_api.h",
+        "src/core/xds/xds_client/xds_backend_metric_propagation.cc",
+        "src/core/xds/xds_client/xds_backend_metric_propagation.h",
         "src/core/xds/xds_client/xds_bootstrap.cc",
         "src/core/xds/xds_client/xds_bootstrap.h",
         "src/core/xds/xds_client/xds_channel_args.h",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index e7c5b7684c3..33b9da00c33 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -1259,6 +1259,7 @@ libs:
   - src/core/xds/grpc/xds_transport_grpc.h
   - src/core/xds/xds_client/lrs_client.h
   - src/core/xds/xds_client/xds_api.h
+  - src/core/xds/xds_client/xds_backend_metric_propagation.h
   - src/core/xds/xds_client/xds_bootstrap.h
   - src/core/xds/xds_client/xds_channel_args.h
   - src/core/xds/xds_client/xds_client.h
@@ -2080,6 +2081,7 @@ libs:
   - src/core/xds/grpc/xds_transport_grpc.cc
   - src/core/xds/xds_client/lrs_client.cc
   - src/core/xds/xds_client/xds_api.cc
+  - src/core/xds/xds_client/xds_backend_metric_propagation.cc
   - src/core/xds/xds_client/xds_bootstrap.cc
   - src/core/xds/xds_client/xds_client.cc
   deps:
diff --git a/config.m4 b/config.m4
index 6a870a7d474..a5d57181f70 100644
--- a/config.m4
+++ b/config.m4
@@ -892,6 +892,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/xds/grpc/xds_transport_grpc.cc \
     src/core/xds/xds_client/lrs_client.cc \
     src/core/xds/xds_client/xds_api.cc \
+    src/core/xds/xds_client/xds_backend_metric_propagation.cc \
     src/core/xds/xds_client/xds_bootstrap.cc \
     src/core/xds/xds_client/xds_client.cc \
     src/php/ext/grpc/byte_buffer.c \
diff --git a/config.w32 b/config.w32
index 05a181a2cb1..c0acf9bfb23 100644
--- a/config.w32
+++ b/config.w32
@@ -857,6 +857,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\xds\\grpc\\xds_transport_grpc.cc " +
     "src\\core\\xds\\xds_client\\lrs_client.cc " +
     "src\\core\\xds\\xds_client\\xds_api.cc " +
+    "src\\core\\xds\\xds_client\\xds_backend_metric_propagation.cc " +
     "src\\core\\xds\\xds_client\\xds_bootstrap.cc " +
     "src\\core\\xds\\xds_client\\xds_client.cc " +
     "src\\php\\ext\\grpc\\byte_buffer.c " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 9d37c6cbe39..481f51c2ea4 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -1373,6 +1373,7 @@ Pod::Spec.new do |s|
                       'src/core/xds/grpc/xds_transport_grpc.h',
                       'src/core/xds/xds_client/lrs_client.h',
                       'src/core/xds/xds_client/xds_api.h',
+                      'src/core/xds/xds_client/xds_backend_metric_propagation.h',
                       'src/core/xds/xds_client/xds_bootstrap.h',
                       'src/core/xds/xds_client/xds_channel_args.h',
                       'src/core/xds/xds_client/xds_client.h',
@@ -2675,6 +2676,7 @@ Pod::Spec.new do |s|
                               'src/core/xds/grpc/xds_transport_grpc.h',
                               'src/core/xds/xds_client/lrs_client.h',
                               'src/core/xds/xds_client/xds_api.h',
+                              'src/core/xds/xds_client/xds_backend_metric_propagation.h',
                               'src/core/xds/xds_client/xds_bootstrap.h',
                               'src/core/xds/xds_client/xds_channel_args.h',
                               'src/core/xds/xds_client/xds_client.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 15080faf737..2867cb57323 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -2152,6 +2152,8 @@ Pod::Spec.new do |s|
                       'src/core/xds/xds_client/lrs_client.h',
                       'src/core/xds/xds_client/xds_api.cc',
                       'src/core/xds/xds_client/xds_api.h',
+                      'src/core/xds/xds_client/xds_backend_metric_propagation.cc',
+                      'src/core/xds/xds_client/xds_backend_metric_propagation.h',
                       'src/core/xds/xds_client/xds_bootstrap.cc',
                       'src/core/xds/xds_client/xds_bootstrap.h',
                       'src/core/xds/xds_client/xds_channel_args.h',
@@ -3460,6 +3462,7 @@ Pod::Spec.new do |s|
                               'src/core/xds/grpc/xds_transport_grpc.h',
                               'src/core/xds/xds_client/lrs_client.h',
                               'src/core/xds/xds_client/xds_api.h',
+                              'src/core/xds/xds_client/xds_backend_metric_propagation.h',
                               'src/core/xds/xds_client/xds_bootstrap.h',
                               'src/core/xds/xds_client/xds_channel_args.h',
                               'src/core/xds/xds_client/xds_client.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index f7829369b0e..bd39eda2bda 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -2038,6 +2038,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/xds/xds_client/lrs_client.h )
   s.files += %w( src/core/xds/xds_client/xds_api.cc )
   s.files += %w( src/core/xds/xds_client/xds_api.h )
+  s.files += %w( src/core/xds/xds_client/xds_backend_metric_propagation.cc )
+  s.files += %w( src/core/xds/xds_client/xds_backend_metric_propagation.h )
   s.files += %w( src/core/xds/xds_client/xds_bootstrap.cc )
   s.files += %w( src/core/xds/xds_client/xds_bootstrap.h )
   s.files += %w( src/core/xds/xds_client/xds_channel_args.h )
diff --git a/package.xml b/package.xml
index 4bd5a7a2f8c..befa4e97aa3 100644
--- a/package.xml
+++ b/package.xml
@@ -2020,6 +2020,8 @@
     <file baseinstalldir="/" name="src/core/xds/xds_client/lrs_client.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_api.cc" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_api.h" role="src" />
+    <file baseinstalldir="/" name="src/core/xds/xds_client/xds_backend_metric_propagation.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/xds/xds_client/xds_backend_metric_propagation.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_bootstrap.cc" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_bootstrap.h" role="src" />
     <file baseinstalldir="/" name="src/core/xds/xds_client/xds_channel_args.h" role="src" />
diff --git a/src/core/BUILD b/src/core/BUILD
index dccdf45962d..13091d6bd38 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -5619,6 +5619,7 @@ grpc_cc_library(
         "json_writer",
         "match",
         "time",
+        "xds_backend_metric_propagation",
         "xds_common_types",
         "xds_health_status",
         "xds_metadata",
@@ -5651,6 +5652,28 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "xds_backend_metric_propagation",
+    srcs = [
+        "xds/xds_client/xds_backend_metric_propagation.cc",
+    ],
+    hdrs = [
+        "xds/xds_client/xds_backend_metric_propagation.h",
+    ],
+    external_deps = [
+        "absl/container:flat_hash_set",
+        "absl/strings",
+    ],
+    language = "c++",
+    tags = ["nofixdeps"],
+    visibility = ["@grpc:xds_client_core"],
+    deps = [
+        "ref_counted",
+        "useful",
+        "//:ref_counted_ptr",
+    ],
+)
+
 # TODO(roth): Split this up into individual targets.
 grpc_cc_library(
     name = "grpc_xds_client",
@@ -5827,6 +5850,7 @@ grpc_cc_library(
         "upb_utils",
         "useful",
         "validation_errors",
+        "xds_backend_metric_propagation",
         "xds_certificate_provider",
         "xds_certificate_provider_store",
         "xds_cluster",
diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc
index eb1a4b3259a..380ed7b108a 100644
--- a/src/core/load_balancing/xds/xds_cluster_impl.cc
+++ b/src/core/load_balancing/xds/xds_cluster_impl.cc
@@ -362,13 +362,9 @@ class XdsClusterImplLb::Picker::SubchannelCallTracker final
     }
     // Record call completion for load reporting.
     if (locality_stats_ != nullptr) {
-      auto* backend_metric_data =
-          args.backend_metric_accessor->GetBackendMetricData();
-      const std::map<absl::string_view, double>* named_metrics = nullptr;
-      if (backend_metric_data != nullptr) {
-        named_metrics = &backend_metric_data->named_metrics;
-      }
-      locality_stats_->AddCallFinished(named_metrics, !args.status.ok());
+      locality_stats_->AddCallFinished(
+          args.backend_metric_accessor->GetBackendMetricData(),
+          !args.status.ok());
     }
     // Decrement number of calls in flight.
     call_counter_->Decrement();
@@ -826,7 +822,8 @@ RefCountedPtr<SubchannelInterface> XdsClusterImplLb::Helper::CreateSubchannel(
         parent()->xds_client_->lrs_client().AddClusterLocalityStats(
             parent()->cluster_resource_->lrs_load_reporting_server,
             parent()->config_->cluster_name(),
-            GetEdsResourceName(*parent()->cluster_resource_), locality_name);
+            GetEdsResourceName(*parent()->cluster_resource_), locality_name,
+            parent()->cluster_resource_->lrs_backend_metric_propagation);
     if (locality_stats == nullptr) {
       LOG(ERROR)
           << "[xds_cluster_impl_lb " << parent()
diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc
index 2d4c2834ff0..09a7454d80f 100644
--- a/src/core/xds/grpc/xds_cluster.cc
+++ b/src/core/xds/grpc/xds_cluster.cc
@@ -53,6 +53,11 @@ std::string XdsClusterResource::ToString() const {
     contents.push_back(absl::StrCat("lrs_load_reporting_server_name=",
                                     lrs_load_reporting_server->server_uri()));
   }
+  if (lrs_backend_metric_propagation != nullptr) {
+    contents.push_back(
+        absl::StrCat("lrs_backend_metric_propagation=",
+                     lrs_backend_metric_propagation->AsString()));
+  }
   if (!common_tls_context.Empty()) {
     contents.push_back(
         absl::StrCat("common_tls_context=", common_tls_context.ToString()));
diff --git a/src/core/xds/grpc/xds_cluster.h b/src/core/xds/grpc/xds_cluster.h
index f733a9328f8..7eea5d0b0fd 100644
--- a/src/core/xds/grpc/xds_cluster.h
+++ b/src/core/xds/grpc/xds_cluster.h
@@ -30,6 +30,7 @@
 #include "src/core/xds/grpc/xds_health_status.h"
 #include "src/core/xds/grpc/xds_metadata.h"
 #include "src/core/xds/grpc/xds_server_grpc.h"
+#include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
 
@@ -44,6 +45,15 @@ inline bool LrsServersEqual(
   return *lrs_server1 == *lrs_server2;
 }
 
+inline bool LrsBackendMetricPropagationEqual(
+    const RefCountedPtr<const BackendMetricPropagation>& p1,
+    const RefCountedPtr<const BackendMetricPropagation>& p2) {
+  if (p1 == nullptr) return p2 == nullptr;
+  if (p2 == nullptr) return false;
+  // Neither one is null, so compare them.
+  return *p1 == *p2;
+}
+
 struct XdsClusterResource : public XdsResourceType::ResourceData {
   struct Eds {
     // If empty, defaults to the cluster name.
@@ -82,6 +92,8 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
   // The LRS server to use for load reporting.
   // If null, load reporting will be disabled.
   std::shared_ptr<const GrpcXdsServer> lrs_load_reporting_server;
+  // The set of metrics to propagate from ORCA to LRS.
+  RefCountedPtr<const BackendMetricPropagation> lrs_backend_metric_propagation;
 
   // Tls Context used by clients
   CommonTlsContext common_tls_context;
@@ -103,6 +115,9 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
     return type == other.type && lb_policy_config == other.lb_policy_config &&
            LrsServersEqual(lrs_load_reporting_server,
                            other.lrs_load_reporting_server) &&
+           LrsBackendMetricPropagationEqual(
+               lrs_backend_metric_propagation,
+               other.lrs_backend_metric_propagation) &&
            common_tls_context == other.common_tls_context &&
            connection_idle_timeout == other.connection_idle_timeout &&
            max_concurrent_requests == other.max_concurrent_requests &&
diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc
index 4b0f2683f10..1a6bbc2e2b6 100644
--- a/src/core/xds/grpc/xds_cluster_parser.cc
+++ b/src/core/xds/grpc/xds_cluster_parser.cc
@@ -59,6 +59,8 @@
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
 #include "src/core/xds/grpc/xds_metadata_parser.h"
+#include "src/core/xds/xds_client/lrs_client.h"
+#include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
 
 namespace grpc_core {
 
@@ -457,6 +459,31 @@ absl::StatusOr<std::shared_ptr<const XdsClusterResource>> CdsResourceParse(
     cds_update->lrs_load_reporting_server = std::make_shared<GrpcXdsServer>(
         static_cast<const GrpcXdsServer&>(context.server));
   }
+  // Record LRS metric propagation.
+  auto propagation = MakeRefCounted<BackendMetricPropagation>();
+  if (XdsOrcaLrsPropagationChangesEnabled()) {
+    size_t size;
+    upb_StringView const* metrics =
+        envoy_config_cluster_v3_Cluster_lrs_report_endpoint_metrics(cluster,
+                                                                    &size);
+    for (size_t i = 0; i < size; ++i) {
+      absl::string_view metric_name = UpbStringToAbsl(metrics[i]);
+      if (metric_name == "cpu_utilization") {
+        propagation->propagation_bits |= propagation->kCpuUtilization;
+      } else if (metric_name == "mem_utilization") {
+        propagation->propagation_bits |= propagation->kMemUtilization;
+      } else if (metric_name == "application_utilization") {
+        propagation->propagation_bits |= propagation->kApplicationUtilization;
+      } else if (absl::ConsumePrefix(&metric_name, "named_metrics.")) {
+        if (metric_name == "*") {
+          propagation->propagation_bits |= propagation->kNamedMetricsAll;
+        } else {
+          propagation->named_metric_keys.emplace(metric_name);
+        }
+      }
+    }
+  }
+  cds_update->lrs_backend_metric_propagation = std::move(propagation);
   // Protocol options.
   auto* upstream_config =
       envoy_config_cluster_v3_Cluster_upstream_config(cluster);
diff --git a/src/core/xds/xds_client/lrs_client.cc b/src/core/xds/xds_client/lrs_client.cc
index b1767a0e037..d8059321d9e 100644
--- a/src/core/xds/xds_client/lrs_client.cc
+++ b/src/core/xds/xds_client/lrs_client.cc
@@ -42,8 +42,10 @@
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/debug_location.h"
+#include "src/core/util/env.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/string.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/util/uri.h"
@@ -61,6 +63,15 @@ namespace grpc_core {
 
 using ::grpc_event_engine::experimental::EventEngine;
 
+// TODO(roth): Remove this once the feature passes interop tests.
+bool XdsOrcaLrsPropagationChangesEnabled() {
+  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION");
+  if (!value.has_value()) return false;
+  bool parsed_value;
+  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
+  return parse_succeeded && parsed_value;
+}
+
 namespace {
 
 uint64_t GetAndResetCounter(std::atomic<uint64_t>* from) {
@@ -124,7 +135,8 @@ void LrsClient::ClusterDropStats::AddCallDropped(const std::string& category) {
 LrsClient::ClusterLocalityStats::ClusterLocalityStats(
     RefCountedPtr<LrsClient> lrs_client, absl::string_view lrs_server,
     absl::string_view cluster_name, absl::string_view eds_service_name,
-    RefCountedPtr<XdsLocalityName> name)
+    RefCountedPtr<XdsLocalityName> name,
+    RefCountedPtr<const BackendMetricPropagation> backend_metric_propagation)
     : RefCounted(GRPC_TRACE_FLAG_ENABLED(xds_client_refcount)
                      ? "ClusterLocalityStats"
                      : nullptr),
@@ -132,13 +144,14 @@ LrsClient::ClusterLocalityStats::ClusterLocalityStats(
       lrs_server_(lrs_server),
       cluster_name_(cluster_name),
       eds_service_name_(eds_service_name),
-      name_(std::move(name)) {
+      name_(std::move(name)),
+      backend_metric_propagation_(std::move(backend_metric_propagation)) {
   GRPC_TRACE_LOG(xds_client, INFO)
       << "[lrs_client " << lrs_client_.get() << "] created locality stats "
       << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", "
       << eds_service_name_ << ", "
       << (name_ == nullptr ? "<none>" : name_->human_readable_string().c_str())
-      << "}";
+      << ", propagation=" << backend_metric_propagation_->AsString() << "}";
 }
 
 LrsClient::ClusterLocalityStats::~ClusterLocalityStats() {
@@ -147,9 +160,10 @@ LrsClient::ClusterLocalityStats::~ClusterLocalityStats() {
       << this << " for {" << lrs_server_ << ", " << cluster_name_ << ", "
       << eds_service_name_ << ", "
       << (name_ == nullptr ? "<none>" : name_->human_readable_string().c_str())
-      << "}";
+      << ", propagation=" << backend_metric_propagation_->AsString() << "}";
   lrs_client_->RemoveClusterLocalityStats(lrs_server_, cluster_name_,
-                                          eds_service_name_, name_, this);
+                                          eds_service_name_, name_,
+                                          backend_metric_propagation_, this);
   lrs_client_.reset(DEBUG_LOCATION, "ClusterLocalityStats");
 }
 
@@ -164,9 +178,16 @@ LrsClient::ClusterLocalityStats::GetSnapshotAndReset() {
         percpu_stats.total_requests_in_progress.load(std::memory_order_relaxed),
         GetAndResetCounter(&percpu_stats.total_error_requests),
         GetAndResetCounter(&percpu_stats.total_issued_requests),
+        {},
+        {},
+        {},
         {}};
     {
       MutexLock lock(&percpu_stats.backend_metrics_mu);
+      percpu_snapshot.cpu_utilization = std::move(percpu_stats.cpu_utilization);
+      percpu_snapshot.mem_utilization = std::move(percpu_stats.mem_utilization);
+      percpu_snapshot.application_utilization =
+          std::move(percpu_stats.application_utilization);
       percpu_snapshot.backend_metrics = std::move(percpu_stats.backend_metrics);
     }
     snapshot += percpu_snapshot;
@@ -181,16 +202,44 @@ void LrsClient::ClusterLocalityStats::AddCallStarted() {
 }
 
 void LrsClient::ClusterLocalityStats::AddCallFinished(
-    const std::map<absl::string_view, double>* named_metrics, bool fail) {
+    const BackendMetricData* backend_metrics, bool fail) {
   Stats& stats = stats_.this_cpu();
   std::atomic<uint64_t>& to_increment =
       fail ? stats.total_error_requests : stats.total_successful_requests;
   to_increment.fetch_add(1, std::memory_order_relaxed);
   stats.total_requests_in_progress.fetch_add(-1, std::memory_order_acq_rel);
-  if (named_metrics == nullptr) return;
+  if (backend_metrics == nullptr) return;
   MutexLock lock(&stats.backend_metrics_mu);
-  for (const auto& m : *named_metrics) {
-    stats.backend_metrics[std::string(m.first)] += BackendMetric{1, m.second};
+  if (!XdsOrcaLrsPropagationChangesEnabled()) {
+    for (const auto& m : backend_metrics->named_metrics) {
+      stats.backend_metrics[std::string(m.first)] += BackendMetric(1, m.second);
+    }
+    return;
+  }
+  if (backend_metric_propagation_->propagation_bits &
+      BackendMetricPropagation::kCpuUtilization) {
+    stats.cpu_utilization += BackendMetric(1, backend_metrics->cpu_utilization);
+  }
+  if (backend_metric_propagation_->propagation_bits &
+      BackendMetricPropagation::kMemUtilization) {
+    stats.mem_utilization += BackendMetric(1, backend_metrics->mem_utilization);
+  }
+  if (backend_metric_propagation_->propagation_bits &
+      BackendMetricPropagation::kApplicationUtilization) {
+    stats.application_utilization +=
+        BackendMetric(1, backend_metrics->application_utilization);
+  }
+  if (backend_metric_propagation_->propagation_bits &
+          BackendMetricPropagation::kNamedMetricsAll ||
+      !backend_metric_propagation_->named_metric_keys.empty()) {
+    for (const auto& m : backend_metrics->named_metrics) {
+      if (backend_metric_propagation_->propagation_bits &
+              BackendMetricPropagation::kNamedMetricsAll ||
+          backend_metric_propagation_->named_metric_keys.contains(m.first)) {
+        stats.backend_metrics[absl::StrCat("named_metrics.", m.first)] +=
+            BackendMetric(1, m.second);
+      }
+    }
   }
 }
 
@@ -825,7 +874,8 @@ RefCountedPtr<LrsClient::ClusterLocalityStats>
 LrsClient::AddClusterLocalityStats(
     std::shared_ptr<const XdsBootstrap::XdsServer> lrs_server,
     absl::string_view cluster_name, absl::string_view eds_service_name,
-    RefCountedPtr<XdsLocalityName> locality) {
+    RefCountedPtr<XdsLocalityName> locality,
+    RefCountedPtr<const BackendMetricPropagation> backend_metric_propagation) {
   auto key =
       std::make_pair(std::string(cluster_name), std::string(eds_service_name));
   RefCountedPtr<ClusterLocalityStats> cluster_locality_stats;
@@ -847,20 +897,22 @@ LrsClient::AddClusterLocalityStats(
     LoadReportState& load_report_state = load_report_it->second;
     LoadReportState::LocalityState& locality_state =
         load_report_state.locality_stats[locality];
-    if (locality_state.locality_stats != nullptr) {
-      cluster_locality_stats = locality_state.locality_stats->RefIfNonZero();
+    ClusterLocalityStats*& locality_stats =
+        locality_state.propagation_stats[backend_metric_propagation];
+    if (locality_stats != nullptr) {
+      cluster_locality_stats = locality_stats->RefIfNonZero();
     }
     if (cluster_locality_stats == nullptr) {
-      if (locality_state.locality_stats != nullptr) {
+      if (locality_stats != nullptr) {
         locality_state.deleted_locality_stats +=
-            locality_state.locality_stats->GetSnapshotAndReset();
+            locality_stats->GetSnapshotAndReset();
       }
       cluster_locality_stats = MakeRefCounted<ClusterLocalityStats>(
           Ref(DEBUG_LOCATION, "LocalityStats"), server_it->first /*lrs_server*/,
           load_report_it->first.first /*cluster_name*/,
           load_report_it->first.second /*eds_service_name*/,
-          std::move(locality));
-      locality_state.locality_stats = cluster_locality_stats.get();
+          std::move(locality), std::move(backend_metric_propagation));
+      locality_stats = cluster_locality_stats.get();
     }
     server_it->second.lrs_channel->MaybeStartLrsCall();
   }
@@ -871,6 +923,8 @@ void LrsClient::RemoveClusterLocalityStats(
     absl::string_view lrs_server_key, absl::string_view cluster_name,
     absl::string_view eds_service_name,
     const RefCountedPtr<XdsLocalityName>& locality,
+    const RefCountedPtr<const BackendMetricPropagation>&
+        backend_metric_propagation,
     ClusterLocalityStats* cluster_locality_stats) {
   MutexLock lock(&mu_);
   auto server_it = load_report_map_.find(lrs_server_key);
@@ -882,12 +936,16 @@ void LrsClient::RemoveClusterLocalityStats(
   auto locality_it = load_report_state.locality_stats.find(locality);
   if (locality_it == load_report_state.locality_stats.end()) return;
   LoadReportState::LocalityState& locality_state = locality_it->second;
-  if (locality_state.locality_stats == cluster_locality_stats) {
+  auto propagation_it =
+      locality_state.propagation_stats.find(backend_metric_propagation);
+  if (propagation_it == locality_state.propagation_stats.end()) return;
+  ClusterLocalityStats* locality_stats = propagation_it->second;
+  if (locality_stats == cluster_locality_stats) {
     // Record final snapshot in deleted_locality_stats, which will be
     // added to the next load report.
     locality_state.deleted_locality_stats +=
-        locality_state.locality_stats->GetSnapshotAndReset();
-    locality_state.locality_stats = nullptr;
+        locality_stats->GetSnapshotAndReset();
+    locality_state.propagation_stats.erase(propagation_it);
   }
 }
 
@@ -940,19 +998,22 @@ LrsClient::ClusterLoadReportMap LrsClient::BuildLoadReportSnapshotLocked(
       ClusterLocalityStats::Snapshot& locality_snapshot =
           snapshot.locality_stats[locality_name];
       locality_snapshot = std::move(locality_state.deleted_locality_stats);
-      if (locality_state.locality_stats != nullptr) {
-        locality_snapshot +=
-            locality_state.locality_stats->GetSnapshotAndReset();
-        GRPC_TRACE_LOG(xds_client, INFO)
-            << "[lrs_client " << this
-            << "] cluster=" << cluster_key.first.c_str()
-            << " eds_service_name=" << cluster_key.second.c_str()
-            << " locality=" << locality_name->human_readable_string().c_str()
-            << " locality_stats=" << locality_state.locality_stats;
+      for (const auto& p : locality_state.propagation_stats) {
+        ClusterLocalityStats* locality_stats = p.second;
+        if (locality_stats != nullptr) {
+          locality_snapshot += locality_stats->GetSnapshotAndReset();
+          GRPC_TRACE_LOG(xds_client, INFO)
+              << "[lrs_client " << this
+              << "] cluster=" << cluster_key.first.c_str()
+              << " eds_service_name=" << cluster_key.second.c_str()
+              << " locality=" << locality_name->human_readable_string().c_str()
+              << " propagation=" << p.first->AsString()
+              << " locality_stats=" << locality_stats;
+        }
       }
       // If the only thing left in this entry was final snapshots from
       // deleted locality stats objects, remove the entry.
-      if (locality_state.locality_stats == nullptr) {
+      if (locality_state.propagation_stats.empty()) {
         it = load_report.locality_stats.erase(it);
       } else {
         ++it;
@@ -1034,6 +1095,20 @@ std::string LrsClient::CreateLrsInitialRequest() {
 
 namespace {
 
+void MaybeAddUnnamedMetric(
+    const LrsApiContext& context,
+    const LrsClient::ClusterLocalityStats::BackendMetric& backend_metric,
+    envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats* (*add_field)(
+        envoy_config_endpoint_v3_UpstreamLocalityStats*, upb_Arena*),
+    envoy_config_endpoint_v3_UpstreamLocalityStats* output) {
+  if (backend_metric.IsZero()) return;
+  auto* metric_proto = add_field(output, context.arena);
+  envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_num_requests_finished_with_metric(
+      metric_proto, backend_metric.num_requests_finished_with_metric);
+  envoy_config_endpoint_v3_UnnamedEndpointLoadMetricStats_set_total_metric_value(
+      metric_proto, backend_metric.total_metric_value);
+}
+
 void LocalityStatsPopulate(
     const LrsApiContext& context,
     envoy_config_endpoint_v3_UpstreamLocalityStats* output,
@@ -1065,6 +1140,18 @@ void LocalityStatsPopulate(
   envoy_config_endpoint_v3_UpstreamLocalityStats_set_total_issued_requests(
       output, snapshot.total_issued_requests);
   // Add backend metrics.
+  MaybeAddUnnamedMetric(
+      context, snapshot.cpu_utilization,
+      envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_cpu_utilization,
+      output);
+  MaybeAddUnnamedMetric(
+      context, snapshot.mem_utilization,
+      envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_mem_utilization,
+      output);
+  MaybeAddUnnamedMetric(
+      context, snapshot.application_utilization,
+      envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_application_utilization,
+      output);
   for (const auto& p : snapshot.backend_metrics) {
     const std::string& metric_name = p.first;
     const LrsClient::ClusterLocalityStats::BackendMetric& metric_value =
diff --git a/src/core/xds/xds_client/lrs_client.h b/src/core/xds/xds_client/lrs_client.h
index 7bda6f68799..36fabc56fe3 100644
--- a/src/core/xds/xds_client/lrs_client.h
+++ b/src/core/xds/xds_client/lrs_client.h
@@ -33,6 +33,7 @@
 #include <grpc/event_engine/event_engine.h>
 
 #include "src/core/lib/debug/trace.h"
+#include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/per_cpu.h"
@@ -43,6 +44,7 @@
 #include "src/core/util/uri.h"
 #include "src/core/util/work_serializer.h"
 #include "src/core/xds/xds_client/xds_api.h"
+#include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_locality.h"
 #include "src/core/xds/xds_client/xds_metrics.h"
@@ -51,6 +53,8 @@
 
 namespace grpc_core {
 
+bool XdsOrcaLrsPropagationChangesEnabled();
+
 class LrsClient : public DualRefCounted<LrsClient> {
  public:
   // Drop stats for an xds cluster.
@@ -114,6 +118,24 @@ class LrsClient : public DualRefCounted<LrsClient> {
       uint64_t num_requests_finished_with_metric = 0;
       double total_metric_value = 0;
 
+      BackendMetric() = default;
+
+      BackendMetric(uint64_t num_requests_finished, double value)
+          : num_requests_finished_with_metric(num_requests_finished),
+            total_metric_value(value) {}
+
+      BackendMetric(BackendMetric&& other) noexcept
+          : num_requests_finished_with_metric(
+                std::exchange(other.num_requests_finished_with_metric, 0)),
+            total_metric_value(std::exchange(other.total_metric_value, 0)) {}
+
+      BackendMetric& operator=(BackendMetric&& other) noexcept {
+        num_requests_finished_with_metric =
+            std::exchange(other.num_requests_finished_with_metric, 0);
+        total_metric_value = std::exchange(other.total_metric_value, 0);
+        return *this;
+      }
+
       BackendMetric& operator+=(const BackendMetric& other) {
         num_requests_finished_with_metric +=
             other.num_requests_finished_with_metric;
@@ -132,6 +154,9 @@ class LrsClient : public DualRefCounted<LrsClient> {
       uint64_t total_requests_in_progress = 0;
       uint64_t total_error_requests = 0;
       uint64_t total_issued_requests = 0;
+      BackendMetric cpu_utilization;
+      BackendMetric mem_utilization;
+      BackendMetric application_utilization;
       std::map<std::string, BackendMetric> backend_metrics;
 
       Snapshot& operator+=(const Snapshot& other) {
@@ -139,6 +164,9 @@ class LrsClient : public DualRefCounted<LrsClient> {
         total_requests_in_progress += other.total_requests_in_progress;
         total_error_requests += other.total_error_requests;
         total_issued_requests += other.total_issued_requests;
+        cpu_utilization += other.cpu_utilization;
+        mem_utilization += other.mem_utilization;
+        application_utilization += other.application_utilization;
         for (const auto& p : other.backend_metrics) {
           backend_metrics[p.first] += p.second;
         }
@@ -147,7 +175,9 @@ class LrsClient : public DualRefCounted<LrsClient> {
 
       bool IsZero() const {
         if (total_successful_requests != 0 || total_requests_in_progress != 0 ||
-            total_error_requests != 0 || total_issued_requests != 0) {
+            total_error_requests != 0 || total_issued_requests != 0 ||
+            !cpu_utilization.IsZero() || !mem_utilization.IsZero() ||
+            !application_utilization.IsZero()) {
           return false;
         }
         for (const auto& p : backend_metrics) {
@@ -161,16 +191,17 @@ class LrsClient : public DualRefCounted<LrsClient> {
                          absl::string_view lrs_server,
                          absl::string_view cluster_name,
                          absl::string_view eds_service_name,
-                         RefCountedPtr<XdsLocalityName> name);
+                         RefCountedPtr<XdsLocalityName> name,
+                         RefCountedPtr<const BackendMetricPropagation>
+                             backend_metric_propagation);
     ~ClusterLocalityStats() override;
 
     // Returns a snapshot of this instance and resets all the counters.
     Snapshot GetSnapshotAndReset();
 
     void AddCallStarted();
-    void AddCallFinished(
-        const std::map<absl::string_view, double>* named_metrics,
-        bool fail = false);
+    void AddCallFinished(const BackendMetricData* backend_metrics,
+                         bool fail = false);
 
     XdsLocalityName* locality_name() const { return name_.get(); }
 
@@ -181,10 +212,10 @@ class LrsClient : public DualRefCounted<LrsClient> {
       std::atomic<uint64_t> total_error_requests{0};
       std::atomic<uint64_t> total_issued_requests{0};
 
-      // Protects backend_metrics. A mutex is necessary because the length of
-      // backend_metrics_ can be accessed by both the callback intercepting the
-      // call's recv_trailing_metadata and the load reporting thread.
       Mutex backend_metrics_mu;
+      BackendMetric cpu_utilization ABSL_GUARDED_BY(backend_metrics_mu);
+      BackendMetric mem_utilization ABSL_GUARDED_BY(backend_metrics_mu);
+      BackendMetric application_utilization ABSL_GUARDED_BY(backend_metrics_mu);
       std::map<std::string, BackendMetric> backend_metrics
           ABSL_GUARDED_BY(backend_metrics_mu);
     };
@@ -194,6 +225,7 @@ class LrsClient : public DualRefCounted<LrsClient> {
     absl::string_view cluster_name_;
     absl::string_view eds_service_name_;
     RefCountedPtr<XdsLocalityName> name_;
+    RefCountedPtr<const BackendMetricPropagation> backend_metric_propagation_;
     PerCpu<Stats> stats_{PerCpuOptions().SetMaxShards(32).SetCpusPerShard(4)};
   };
 
@@ -204,17 +236,18 @@ class LrsClient : public DualRefCounted<LrsClient> {
       std::shared_ptr<grpc_event_engine::experimental::EventEngine> engine);
   ~LrsClient() override;
 
-  // Adds and removes drop stats for cluster_name and eds_service_name.
+  // Adds drop stats for cluster_name and eds_service_name.
   RefCountedPtr<ClusterDropStats> AddClusterDropStats(
       std::shared_ptr<const XdsBootstrap::XdsServer> lrs_server,
       absl::string_view cluster_name, absl::string_view eds_service_name);
 
-  // Adds and removes locality stats for cluster_name and eds_service_name
-  // for the specified locality.
+  // Adds locality stats for cluster_name and eds_service_name for the
+  // specified locality with the specified backend metric propagation.
   RefCountedPtr<ClusterLocalityStats> AddClusterLocalityStats(
       std::shared_ptr<const XdsBootstrap::XdsServer> lrs_server,
       absl::string_view cluster_name, absl::string_view eds_service_name,
-      RefCountedPtr<XdsLocalityName> locality);
+      RefCountedPtr<XdsLocalityName> locality,
+      RefCountedPtr<const BackendMetricPropagation> backend_metric_propagation);
 
   // Resets connection backoff state.
   void ResetBackoff();
@@ -267,7 +300,9 @@ class LrsClient : public DualRefCounted<LrsClient> {
 
   struct LoadReportState {
     struct LocalityState {
-      ClusterLocalityStats* locality_stats = nullptr;
+      std::map<RefCountedPtr<const BackendMetricPropagation>,
+               ClusterLocalityStats*, BackendMetricPropagation::Less>
+          propagation_stats;
       ClusterLocalityStats::Snapshot deleted_locality_stats;
     };
 
@@ -321,6 +356,8 @@ class LrsClient : public DualRefCounted<LrsClient> {
       absl::string_view lrs_server, absl::string_view cluster_name,
       absl::string_view eds_service_name,
       const RefCountedPtr<XdsLocalityName>& locality,
+      const RefCountedPtr<const BackendMetricPropagation>&
+          backend_metric_propagation,
       ClusterLocalityStats* cluster_locality_stats);
 
   // Creates an initial LRS request.
diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.cc b/src/core/xds/xds_client/xds_backend_metric_propagation.cc
new file mode 100644
index 00000000000..1d514a0f25c
--- /dev/null
+++ b/src/core/xds/xds_client/xds_backend_metric_propagation.cc
@@ -0,0 +1,64 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
+
+#include <vector>
+
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+
+#include "src/core/util/useful.h"
+
+namespace grpc_core {
+
+std::string BackendMetricPropagation::AsString() const {
+  std::vector<std::string> parts;
+  if (propagation_bits & kCpuUtilization) parts.push_back("cpu_utilization");
+  if (propagation_bits & kMemUtilization) parts.push_back("mem_utilization");
+  if (propagation_bits & kApplicationUtilization) {
+    parts.push_back("application_utilization");
+  }
+  if (propagation_bits & kNamedMetricsAll) {
+    parts.push_back("named_metrics.*");
+  } else {
+    // Output keys in sorted order for consistency.
+    std::vector<absl::string_view> keys(named_metric_keys.begin(),
+                                        named_metric_keys.end());
+    std::sort(keys.begin(), keys.end());
+    for (const auto& key : keys) {
+      parts.push_back(absl::StrCat("named_metrics.", key));
+    }
+  }
+  return absl::StrCat("{", absl::StrJoin(parts, ","), "}");
+}
+
+bool BackendMetricPropagation::operator<(
+    const BackendMetricPropagation& other) const {
+  int c = QsortCompare(propagation_bits, other.propagation_bits);
+  if (c != 0) return c == -1;
+  auto other_it = other.named_metric_keys.begin();
+  for (auto it = named_metric_keys.begin(); it != named_metric_keys.end();
+       ++it) {
+    if (other_it == other.named_metric_keys.end()) return false;
+    c = QsortCompare(*it, *other_it);
+    if (c != 0) return c == -1;
+    ++other_it;
+  }
+  return false;
+}
+
+}  // namespace grpc_core
diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.h b/src/core/xds/xds_client/xds_backend_metric_propagation.h
new file mode 100644
index 00000000000..4216c0ac47e
--- /dev/null
+++ b/src/core/xds/xds_client/xds_backend_metric_propagation.h
@@ -0,0 +1,60 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BACKEND_METRIC_PROPAGATION_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BACKEND_METRIC_PROPAGATION_H
+
+#include <string>
+
+#include "absl/container/flat_hash_set.h"
+
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
+
+namespace grpc_core {
+
+struct BackendMetricPropagation : public RefCounted<BackendMetricPropagation> {
+  static constexpr uint8_t kCpuUtilization = 1;
+  static constexpr uint8_t kMemUtilization = 2;
+  static constexpr uint8_t kApplicationUtilization = 4;
+  static constexpr uint8_t kNamedMetricsAll = 8;
+
+  uint8_t propagation_bits = 0;
+  absl::flat_hash_set<std::string> named_metric_keys;
+
+  std::string AsString() const;
+
+  bool operator==(const BackendMetricPropagation& other) const {
+    return propagation_bits == other.propagation_bits &&
+           named_metric_keys == other.named_metric_keys;
+  }
+
+  bool operator<(const BackendMetricPropagation& other) const;
+
+  // Sorting functor for RefCountedPtr<const BackendMetricPropagation>.
+  struct Less {
+    bool operator()(
+        const RefCountedPtr<const BackendMetricPropagation>& p1,
+        const RefCountedPtr<const BackendMetricPropagation>& p2) const {
+      if (p1 == nullptr || p2 == nullptr) return p1.get() < p2.get();
+      return *p1 < *p2;
+    }
+  };
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BACKEND_METRIC_PROPAGATION_H
diff --git a/src/proto/grpc/testing/xds/v3/cluster.proto b/src/proto/grpc/testing/xds/v3/cluster.proto
index a7c438399a4..bc4325e378a 100644
--- a/src/proto/grpc/testing/xds/v3/cluster.proto
+++ b/src/proto/grpc/testing/xds/v3/cluster.proto
@@ -252,6 +252,21 @@ message Cluster {
   // from the LRS stream here.]
   core.v3.ConfigSource lrs_server = 42;
 
+  // A list of metric names from ORCA load reports to propagate to LRS.
+  //
+  // For map fields in the ORCA proto, the string will be of the form ``<map_field_name>.<map_key>``.
+  // For example, the string ``named_metrics.foo`` will mean to look for the key ``foo`` in the ORCA
+  // ``named_metrics`` field.
+  //
+  // The special map key ``*`` means to report all entries in the map (e.g., ``named_metrics.*`` means to
+  // report all entries in the ORCA named_metrics field). Note that this should be used only with trusted
+  // backends.
+  //
+  // The metric names in LRS will follow the same semantics as this field. In other words, if this field
+  // contains ``named_metrics.foo``, then the LRS load report will include the data with that same string
+  // as the key.
+  repeated string lrs_report_endpoint_metrics = 57;
+
   // The Metadata field can be used to provide additional information about the
   // cluster. It can be used for stats, logging, and varying filter behavior.
   // Fields should use reverse DNS notation to denote which entity within Envoy
diff --git a/src/proto/grpc/testing/xds/v3/load_report.proto b/src/proto/grpc/testing/xds/v3/load_report.proto
index b8ee86fb485..a62e7835050 100644
--- a/src/proto/grpc/testing/xds/v3/load_report.proto
+++ b/src/proto/grpc/testing/xds/v3/load_report.proto
@@ -51,7 +51,20 @@ message UpstreamLocalityStats {
   // upstream endpoints in the locality.
   uint64 total_issued_requests = 8;
 
-  // Stats for multi-dimensional load balancing.
+  // CPU utilization stats for multi-dimensional load balancing.
+  // This typically comes from endpoint metrics reported via ORCA.
+  UnnamedEndpointLoadMetricStats cpu_utilization = 12;
+
+  // Memory utilization for multi-dimensional load balancing.
+  // This typically comes from endpoint metrics reported via ORCA.
+  UnnamedEndpointLoadMetricStats mem_utilization = 13;
+
+  // Blended application-defined utilization for multi-dimensional load balancing.
+  // This typically comes from endpoint metrics reported via ORCA.
+  UnnamedEndpointLoadMetricStats application_utilization = 14;
+
+  // Named stats for multi-dimensional load balancing.
+  // These typically come from endpoint metrics reported via ORCA.
   repeated EndpointLoadMetricStats load_metric_stats = 5;
 
   // Endpoint granularity stats information for this locality. This information
@@ -117,6 +130,16 @@ message EndpointLoadMetricStats {
   double total_metric_value = 3;
 }
 
+// Same as EndpointLoadMetricStats, except without the metric_name field.
+message UnnamedEndpointLoadMetricStats {
+  // Number of calls that finished and included this metric.
+  uint64 num_requests_finished_with_metric = 1;
+
+  // Sum of metric values across all calls that finished with this metric for
+  // load_reporting_interval.
+  double total_metric_value = 2;
+}
+
 // Per cluster load stats. Envoy reports these stats a management server in a
 // :ref:`LoadStatsRequest<envoy_api_msg_service.load_stats.v3.LoadStatsRequest>`
 // [#not-implemented-hide:] Not configuration. TBD how to doc proto APIs.
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index f5b68900662..c7e8f2b4c9f 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -866,6 +866,7 @@ CORE_SOURCE_FILES = [
     'src/core/xds/grpc/xds_transport_grpc.cc',
     'src/core/xds/xds_client/lrs_client.cc',
     'src/core/xds/xds_client/xds_api.cc',
+    'src/core/xds/xds_client/xds_backend_metric_propagation.cc',
     'src/core/xds/xds_client/xds_bootstrap.cc',
     'src/core/xds/xds_client/xds_client.cc',
     'third_party/abseil-cpp/absl/base/internal/cycleclock.cc',
diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc
index fed2848dc65..804241913e8 100644
--- a/test/core/xds/xds_cluster_resource_type_test.cc
+++ b/test/core/xds/xds_cluster_resource_type_test.cc
@@ -1113,7 +1113,7 @@ TEST_F(TlsConfigTest, CaCertProviderUnset) {
 }
 
 //
-// LRS server tests
+// LRS tests
 //
 
 using LrsTest = XdsClusterTest;
@@ -1160,6 +1160,92 @@ TEST_F(LrsTest, NotSelfConfigSource) {
       << decode_result.resource.status();
 }
 
+TEST_F(LrsTest, IgnoresPropagationWithoutEnvVar) {
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  cluster.mutable_lrs_server()->mutable_self();
+  cluster.add_lrs_report_endpoint_metrics("named_metrics.foo");
+  cluster.add_lrs_report_endpoint_metrics("cpu_utilization");
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsClusterResource&>(**decode_result.resource);
+  ASSERT_NE(resource.lrs_load_reporting_server, nullptr);
+  EXPECT_EQ(*resource.lrs_load_reporting_server,
+            *xds_client_->bootstrap().servers().front());
+  ASSERT_NE(resource.lrs_backend_metric_propagation, nullptr);
+  EXPECT_EQ(resource.lrs_backend_metric_propagation->AsString(), "{}");
+}
+
+TEST_F(LrsTest, Propagation) {
+  ScopedExperimentalEnvVar env_var(
+      "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  cluster.mutable_lrs_server()->mutable_self();
+  cluster.add_lrs_report_endpoint_metrics("named_metrics.foo");
+  cluster.add_lrs_report_endpoint_metrics("named_metrics.bar");
+  cluster.add_lrs_report_endpoint_metrics("cpu_utilization");
+  cluster.add_lrs_report_endpoint_metrics("mem_utilization");
+  cluster.add_lrs_report_endpoint_metrics("application_utilization");
+  cluster.add_lrs_report_endpoint_metrics("unknown_field");
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsClusterResource&>(**decode_result.resource);
+  ASSERT_NE(resource.lrs_load_reporting_server, nullptr);
+  EXPECT_EQ(*resource.lrs_load_reporting_server,
+            *xds_client_->bootstrap().servers().front());
+  ASSERT_NE(resource.lrs_backend_metric_propagation, nullptr);
+  EXPECT_EQ(resource.lrs_backend_metric_propagation->AsString(),
+            "{cpu_utilization,mem_utilization,application_utilization,"
+            "named_metrics.bar,named_metrics.foo}");
+}
+
+TEST_F(LrsTest, PropagationNamedMetricsAll) {
+  ScopedExperimentalEnvVar env_var(
+      "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  cluster.mutable_lrs_server()->mutable_self();
+  cluster.add_lrs_report_endpoint_metrics("named_metrics.*");
+  cluster.add_lrs_report_endpoint_metrics("cpu_utilization");
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsClusterResource&>(**decode_result.resource);
+  ASSERT_NE(resource.lrs_load_reporting_server, nullptr);
+  EXPECT_EQ(*resource.lrs_load_reporting_server,
+            *xds_client_->bootstrap().servers().front());
+  ASSERT_NE(resource.lrs_backend_metric_propagation, nullptr);
+  EXPECT_EQ(resource.lrs_backend_metric_propagation->AsString(),
+            "{cpu_utilization,named_metrics.*}");
+}
+
 //
 // upstream config tests
 //
diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
index 24398adf7f3..c10f22d4851 100644
--- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
@@ -1724,6 +1724,325 @@ TEST_P(ClientLoadReportingTest, Vanilla) {
   EXPECT_EQ(1U, balancer_->lrs_service()->response_count());
 }
 
+// Tests ORCA to LRS propagation.
+TEST_P(ClientLoadReportingTest, OrcaPropagation) {
+  grpc_core::testing::ScopedExperimentalEnvVar env(
+      "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION");
+  CreateAndStartBackends(4);
+  const size_t kNumRpcsPerAddress = 10;
+  const size_t kNumFailuresPerAddress = 3;
+  Cluster cluster = default_cluster_;
+  cluster.add_lrs_report_endpoint_metrics("named_metrics.foo");
+  cluster.add_lrs_report_endpoint_metrics("cpu_utilization");
+  cluster.add_lrs_report_endpoint_metrics("mem_utilization");
+  cluster.add_lrs_report_endpoint_metrics("application_utilization");
+  cluster.add_lrs_report_endpoint_metrics("unknown_field");
+  balancer_->ads_service()->SetCdsResource(cluster);
+  EdsResourceArgs args({
+      {"locality0", CreateEndpointsForBackends(0, 2)},
+      {"locality1", CreateEndpointsForBackends(2, 4)},
+  });
+  balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
+  // Wait until all backends are ready.
+  size_t num_warmup_rpcs =
+      WaitForAllBackends(DEBUG_LOCATION, 0, 4, /*check_status=*/nullptr,
+                         WaitForBackendOptions().set_reset_counters(false));
+  // Send kNumRpcsPerAddress RPCs per server with named metrics.
+  xds::data::orca::v3::OrcaLoadReport backend_metrics;
+  backend_metrics.set_cpu_utilization(0.8);
+  backend_metrics.set_mem_utilization(0.6);
+  backend_metrics.set_application_utilization(0.4);
+  auto& named_metrics = (*backend_metrics.mutable_named_metrics());
+  named_metrics["foo"] = 1.0;
+  named_metrics["bar"] = 2.0;  // Not propagated.
+  CheckRpcSendOk(DEBUG_LOCATION, kNumRpcsPerAddress * backends_.size(),
+                 RpcOptions().set_backend_metrics(backend_metrics));
+  backend_metrics.set_cpu_utilization(0.4);
+  backend_metrics.set_mem_utilization(0.3);
+  backend_metrics.set_application_utilization(0.2);
+  named_metrics["foo"] = 0.3;
+  named_metrics["bar"] = 0.4;  // Not propagated.
+  for (size_t i = 0; i < kNumFailuresPerAddress * backends_.size(); ++i) {
+    CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::FAILED_PRECONDITION, "",
+                        RpcOptions().set_server_fail(true).set_backend_metrics(
+                            backend_metrics));
+  }
+  const size_t total_successful_rpcs_sent =
+      (kNumRpcsPerAddress * backends_.size()) + num_warmup_rpcs;
+  const size_t total_failed_rpcs_sent =
+      kNumFailuresPerAddress * backends_.size();
+  // Check that the backends got the right number of requests.
+  size_t total_rpcs_sent = 0;
+  for (const auto& backend : backends_) {
+    total_rpcs_sent += backend->backend_service()->request_count();
+  }
+  EXPECT_EQ(total_rpcs_sent,
+            total_successful_rpcs_sent + total_failed_rpcs_sent);
+  // The load report received at the balancer should be correct.
+  std::vector<ClientStats> load_report =
+      balancer_->lrs_service()->WaitForLoadReport();
+  ASSERT_EQ(load_report.size(), 1UL);
+  ClientStats& client_stats = load_report.front();
+  EXPECT_EQ(client_stats.cluster_name(), kDefaultClusterName);
+  EXPECT_EQ(client_stats.eds_service_name(), kDefaultEdsServiceName);
+  EXPECT_EQ(total_successful_rpcs_sent,
+            client_stats.total_successful_requests());
+  EXPECT_EQ(0U, client_stats.total_requests_in_progress());
+  EXPECT_EQ(total_rpcs_sent, client_stats.total_issued_requests());
+  EXPECT_EQ(total_failed_rpcs_sent, client_stats.total_error_requests());
+  EXPECT_EQ(0U, client_stats.total_dropped_requests());
+  ASSERT_THAT(
+      client_stats.locality_stats(),
+      ::testing::ElementsAre(::testing::Pair("locality0", ::testing::_),
+                             ::testing::Pair("locality1", ::testing::_)));
+  size_t num_successful_rpcs = 0;
+  size_t num_failed_rpcs = 0;
+  ClientStats::LocalityStats::LoadMetric cpu_utilization;
+  ClientStats::LocalityStats::LoadMetric mem_utilization;
+  ClientStats::LocalityStats::LoadMetric application_utilization;
+  std::map<std::string, ClientStats::LocalityStats::LoadMetric>
+      named_metrics_total;
+  for (const auto& p : client_stats.locality_stats()) {
+    EXPECT_EQ(p.second.total_requests_in_progress, 0U);
+    EXPECT_EQ(
+        p.second.total_issued_requests,
+        p.second.total_successful_requests + p.second.total_error_requests);
+    num_successful_rpcs += p.second.total_successful_requests;
+    num_failed_rpcs += p.second.total_error_requests;
+    cpu_utilization += p.second.cpu_utilization;
+    mem_utilization += p.second.mem_utilization;
+    application_utilization += p.second.application_utilization;
+    for (const auto& s : p.second.load_metrics) {
+      named_metrics_total[s.first] += s.second;
+    }
+  }
+  EXPECT_EQ(num_successful_rpcs, total_successful_rpcs_sent);
+  EXPECT_EQ(num_failed_rpcs, total_failed_rpcs_sent);
+  EXPECT_EQ(num_successful_rpcs + num_failed_rpcs, total_rpcs_sent);
+  EXPECT_THAT(
+      cpu_utilization,
+      LoadMetricEq(
+          (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(),
+          (kNumRpcsPerAddress * backends_.size()) * 0.8 +
+              (kNumFailuresPerAddress * backends_.size()) * 0.4));
+  EXPECT_THAT(
+      mem_utilization,
+      LoadMetricEq(
+          (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(),
+          (kNumRpcsPerAddress * backends_.size()) * 0.6 +
+              (kNumFailuresPerAddress * backends_.size()) * 0.3));
+  EXPECT_THAT(
+      application_utilization,
+      LoadMetricEq(
+          (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(),
+          (kNumRpcsPerAddress * backends_.size()) * 0.4 +
+              (kNumFailuresPerAddress * backends_.size()) * 0.2));
+  EXPECT_THAT(
+      named_metrics_total,
+      ::testing::UnorderedElementsAre(::testing::Pair(
+          "named_metrics.foo",
+          LoadMetricEq(
+              (kNumRpcsPerAddress + kNumFailuresPerAddress) * backends_.size(),
+              (kNumRpcsPerAddress * backends_.size()) * 1.0 +
+                  (kNumFailuresPerAddress * backends_.size()) * 0.3))));
+  // The LRS service got a single request, and sent a single response.
+  EXPECT_EQ(1U, balancer_->lrs_service()->request_count());
+  EXPECT_EQ(1U, balancer_->lrs_service()->response_count());
+}
+
+TEST_P(ClientLoadReportingTest, OrcaPropagationNamedMetricsAll) {
+  grpc_core::testing::ScopedExperimentalEnvVar env(
+      "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION");
+  CreateAndStartBackends(4);
+  const size_t kNumRpcsPerAddress = 10;
+  const size_t kNumFailuresPerAddress = 3;
+  Cluster cluster = default_cluster_;
+  cluster.add_lrs_report_endpoint_metrics("named_metrics.*");
+  balancer_->ads_service()->SetCdsResource(cluster);
+  EdsResourceArgs args({
+      {"locality0", CreateEndpointsForBackends(0, 2)},
+      {"locality1", CreateEndpointsForBackends(2, 4)},
+  });
+  balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
+  // Wait until all backends are ready.
+  size_t num_warmup_rpcs =
+      WaitForAllBackends(DEBUG_LOCATION, 0, 4, /*check_status=*/nullptr,
+                         WaitForBackendOptions().set_reset_counters(false));
+  // Send kNumRpcsPerAddress RPCs per server with named metrics.
+  xds::data::orca::v3::OrcaLoadReport backend_metrics;
+  backend_metrics.set_cpu_utilization(0.8);
+  backend_metrics.set_mem_utilization(0.6);
+  backend_metrics.set_application_utilization(0.4);
+  auto& named_metrics = (*backend_metrics.mutable_named_metrics());
+  named_metrics["foo"] = 1.0;
+  named_metrics["bar"] = 2.0;
+  CheckRpcSendOk(DEBUG_LOCATION, kNumRpcsPerAddress * backends_.size(),
+                 RpcOptions().set_backend_metrics(backend_metrics));
+  backend_metrics.set_cpu_utilization(0.4);
+  backend_metrics.set_mem_utilization(0.3);
+  backend_metrics.set_application_utilization(0.2);
+  named_metrics["foo"] = 0.3;
+  named_metrics["bar"] = 0.4;
+  for (size_t i = 0; i < kNumFailuresPerAddress * backends_.size(); ++i) {
+    CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::FAILED_PRECONDITION, "",
+                        RpcOptions().set_server_fail(true).set_backend_metrics(
+                            backend_metrics));
+  }
+  const size_t total_successful_rpcs_sent =
+      (kNumRpcsPerAddress * backends_.size()) + num_warmup_rpcs;
+  const size_t total_failed_rpcs_sent =
+      kNumFailuresPerAddress * backends_.size();
+  // Check that the backends got the right number of requests.
+  size_t total_rpcs_sent = 0;
+  for (const auto& backend : backends_) {
+    total_rpcs_sent += backend->backend_service()->request_count();
+  }
+  EXPECT_EQ(total_rpcs_sent,
+            total_successful_rpcs_sent + total_failed_rpcs_sent);
+  // The load report received at the balancer should be correct.
+  std::vector<ClientStats> load_report =
+      balancer_->lrs_service()->WaitForLoadReport();
+  ASSERT_EQ(load_report.size(), 1UL);
+  ClientStats& client_stats = load_report.front();
+  EXPECT_EQ(client_stats.cluster_name(), kDefaultClusterName);
+  EXPECT_EQ(client_stats.eds_service_name(), kDefaultEdsServiceName);
+  EXPECT_EQ(total_successful_rpcs_sent,
+            client_stats.total_successful_requests());
+  EXPECT_EQ(0U, client_stats.total_requests_in_progress());
+  EXPECT_EQ(total_rpcs_sent, client_stats.total_issued_requests());
+  EXPECT_EQ(total_failed_rpcs_sent, client_stats.total_error_requests());
+  EXPECT_EQ(0U, client_stats.total_dropped_requests());
+  ASSERT_THAT(
+      client_stats.locality_stats(),
+      ::testing::ElementsAre(::testing::Pair("locality0", ::testing::_),
+                             ::testing::Pair("locality1", ::testing::_)));
+  size_t num_successful_rpcs = 0;
+  size_t num_failed_rpcs = 0;
+  std::map<std::string, ClientStats::LocalityStats::LoadMetric>
+      named_metrics_total;
+  for (const auto& p : client_stats.locality_stats()) {
+    EXPECT_EQ(p.second.total_requests_in_progress, 0U);
+    EXPECT_EQ(
+        p.second.total_issued_requests,
+        p.second.total_successful_requests + p.second.total_error_requests);
+    num_successful_rpcs += p.second.total_successful_requests;
+    num_failed_rpcs += p.second.total_error_requests;
+    for (const auto& s : p.second.load_metrics) {
+      named_metrics_total[s.first] += s.second;
+    }
+  }
+  EXPECT_EQ(num_successful_rpcs, total_successful_rpcs_sent);
+  EXPECT_EQ(num_failed_rpcs, total_failed_rpcs_sent);
+  EXPECT_EQ(num_successful_rpcs + num_failed_rpcs, total_rpcs_sent);
+  EXPECT_THAT(
+      named_metrics_total,
+      ::testing::UnorderedElementsAre(
+          ::testing::Pair(
+              "named_metrics.foo",
+              LoadMetricEq(
+                  (kNumRpcsPerAddress + kNumFailuresPerAddress) *
+                      backends_.size(),
+                  (kNumRpcsPerAddress * backends_.size()) * 1.0 +
+                      (kNumFailuresPerAddress * backends_.size()) * 0.3)),
+          ::testing::Pair(
+              "named_metrics.bar",
+              LoadMetricEq(
+                  (kNumRpcsPerAddress + kNumFailuresPerAddress) *
+                      backends_.size(),
+                  (kNumRpcsPerAddress * backends_.size()) * 2.0 +
+                      (kNumFailuresPerAddress * backends_.size()) * 0.4))));
+  // The LRS service got a single request, and sent a single response.
+  EXPECT_EQ(1U, balancer_->lrs_service()->request_count());
+  EXPECT_EQ(1U, balancer_->lrs_service()->response_count());
+}
+
+TEST_P(ClientLoadReportingTest, OrcaPropagationNotConfigured) {
+  grpc_core::testing::ScopedExperimentalEnvVar env(
+      "GRPC_EXPERIMENTAL_XDS_ORCA_LRS_PROPAGATION");
+  CreateAndStartBackends(4);
+  const size_t kNumRpcsPerAddress = 10;
+  const size_t kNumFailuresPerAddress = 3;
+  EdsResourceArgs args({
+      {"locality0", CreateEndpointsForBackends(0, 2)},
+      {"locality1", CreateEndpointsForBackends(2, 4)},
+  });
+  balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
+  // Wait until all backends are ready.
+  size_t num_warmup_rpcs =
+      WaitForAllBackends(DEBUG_LOCATION, 0, 4, /*check_status=*/nullptr,
+                         WaitForBackendOptions().set_reset_counters(false));
+  // Send kNumRpcsPerAddress RPCs per server with named metrics.
+  xds::data::orca::v3::OrcaLoadReport backend_metrics;
+  backend_metrics.set_cpu_utilization(0.8);
+  backend_metrics.set_mem_utilization(0.6);
+  backend_metrics.set_application_utilization(0.4);
+  auto& named_metrics = (*backend_metrics.mutable_named_metrics());
+  named_metrics["foo"] = 1.0;
+  named_metrics["bar"] = 2.0;
+  CheckRpcSendOk(DEBUG_LOCATION, kNumRpcsPerAddress * backends_.size(),
+                 RpcOptions().set_backend_metrics(backend_metrics));
+  backend_metrics.set_cpu_utilization(0.4);
+  backend_metrics.set_mem_utilization(0.3);
+  backend_metrics.set_application_utilization(0.2);
+  named_metrics["foo"] = 0.3;
+  named_metrics["bar"] = 0.4;
+  for (size_t i = 0; i < kNumFailuresPerAddress * backends_.size(); ++i) {
+    CheckRpcSendFailure(DEBUG_LOCATION, StatusCode::FAILED_PRECONDITION, "",
+                        RpcOptions().set_server_fail(true).set_backend_metrics(
+                            backend_metrics));
+  }
+  const size_t total_successful_rpcs_sent =
+      (kNumRpcsPerAddress * backends_.size()) + num_warmup_rpcs;
+  const size_t total_failed_rpcs_sent =
+      kNumFailuresPerAddress * backends_.size();
+  // Check that the backends got the right number of requests.
+  size_t total_rpcs_sent = 0;
+  for (const auto& backend : backends_) {
+    total_rpcs_sent += backend->backend_service()->request_count();
+  }
+  EXPECT_EQ(total_rpcs_sent,
+            total_successful_rpcs_sent + total_failed_rpcs_sent);
+  // The load report received at the balancer should be correct.
+  std::vector<ClientStats> load_report =
+      balancer_->lrs_service()->WaitForLoadReport();
+  ASSERT_EQ(load_report.size(), 1UL);
+  ClientStats& client_stats = load_report.front();
+  EXPECT_EQ(client_stats.cluster_name(), kDefaultClusterName);
+  EXPECT_EQ(client_stats.eds_service_name(), kDefaultEdsServiceName);
+  EXPECT_EQ(total_successful_rpcs_sent,
+            client_stats.total_successful_requests());
+  EXPECT_EQ(0U, client_stats.total_requests_in_progress());
+  EXPECT_EQ(total_rpcs_sent, client_stats.total_issued_requests());
+  EXPECT_EQ(total_failed_rpcs_sent, client_stats.total_error_requests());
+  EXPECT_EQ(0U, client_stats.total_dropped_requests());
+  ASSERT_THAT(
+      client_stats.locality_stats(),
+      ::testing::ElementsAre(::testing::Pair("locality0", ::testing::_),
+                             ::testing::Pair("locality1", ::testing::_)));
+  size_t num_successful_rpcs = 0;
+  size_t num_failed_rpcs = 0;
+  std::map<std::string, ClientStats::LocalityStats::LoadMetric>
+      named_metrics_total;
+  for (const auto& p : client_stats.locality_stats()) {
+    EXPECT_EQ(p.second.total_requests_in_progress, 0U);
+    EXPECT_EQ(
+        p.second.total_issued_requests,
+        p.second.total_successful_requests + p.second.total_error_requests);
+    num_successful_rpcs += p.second.total_successful_requests;
+    num_failed_rpcs += p.second.total_error_requests;
+    for (const auto& s : p.second.load_metrics) {
+      named_metrics_total[s.first] += s.second;
+    }
+  }
+  EXPECT_EQ(num_successful_rpcs, total_successful_rpcs_sent);
+  EXPECT_EQ(num_failed_rpcs, total_failed_rpcs_sent);
+  EXPECT_EQ(num_successful_rpcs + num_failed_rpcs, total_rpcs_sent);
+  EXPECT_THAT(named_metrics_total, ::testing::UnorderedElementsAre());
+  // The LRS service got a single request, and sent a single response.
+  EXPECT_EQ(1U, balancer_->lrs_service()->request_count());
+  EXPECT_EQ(1U, balancer_->lrs_service()->response_count());
+}
+
 // Tests send_all_clusters.
 TEST_P(ClientLoadReportingTest, SendAllClusters) {
   CreateAndStartBackends(2);
diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h
index 5183e9cd562..02e3fcbe50d 100644
--- a/test/cpp/end2end/xds/xds_end2end_test_lib.h
+++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h
@@ -304,6 +304,18 @@ class XdsEnd2endTest : public ::testing::TestWithParam<XdsTestType>,
         if (request->has_param() && request->param().has_backend_metrics()) {
           const auto& request_metrics = request->param().backend_metrics();
           auto* recorder = context->ExperimentalGetCallMetricRecorder();
+          if (request_metrics.cpu_utilization() != 0) {
+            recorder->RecordCpuUtilizationMetric(
+                request_metrics.cpu_utilization());
+          }
+          if (request_metrics.mem_utilization() != 0) {
+            recorder->RecordMemoryUtilizationMetric(
+                request_metrics.mem_utilization());
+          }
+          if (request_metrics.application_utilization() != 0) {
+            recorder->RecordApplicationUtilizationMetric(
+                request_metrics.application_utilization());
+          }
           for (const auto& p : request_metrics.named_metrics()) {
             char* key = static_cast<char*>(
                 grpc_call_arena_alloc(context->c_call(), p.first.size() + 1));
diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h
index 4131362f7b0..2b6c508faf7 100644
--- a/test/cpp/end2end/xds/xds_server.h
+++ b/test/cpp/end2end/xds/xds_server.h
@@ -617,8 +617,19 @@ class LrsServiceImpl
     // Stats for a given locality.
     struct LocalityStats {
       struct LoadMetric {
-        uint64_t num_requests_finished_with_metric;
-        double total_metric_value;
+        uint64_t num_requests_finished_with_metric = 0;
+        double total_metric_value = 0;
+
+        LoadMetric() = default;
+
+        // Works for both EndpointLoadMetricStats and
+        // UnnamedEndpointLoadMetricStats.
+        template <typename T>
+        explicit LoadMetric(const T& stats)
+            : num_requests_finished_with_metric(
+                  stats.num_requests_finished_with_metric()),
+              total_metric_value(stats.total_metric_value()) {}
+
         LoadMetric& operator+=(const LoadMetric& other) {
           num_requests_finished_with_metric +=
               other.num_requests_finished_with_metric;
@@ -640,10 +651,13 @@ class LrsServiceImpl
             total_error_requests(
                 upstream_locality_stats.total_error_requests()),
             total_issued_requests(
-                upstream_locality_stats.total_issued_requests()) {
+                upstream_locality_stats.total_issued_requests()),
+            cpu_utilization(upstream_locality_stats.cpu_utilization()),
+            mem_utilization(upstream_locality_stats.mem_utilization()),
+            application_utilization(
+                upstream_locality_stats.application_utilization()) {
         for (const auto& s : upstream_locality_stats.load_metric_stats()) {
-          load_metrics[s.metric_name()] += LoadMetric{
-              s.num_requests_finished_with_metric(), s.total_metric_value()};
+          load_metrics[s.metric_name()] += LoadMetric(s);
         }
       }
 
@@ -652,6 +666,9 @@ class LrsServiceImpl
         total_requests_in_progress += other.total_requests_in_progress;
         total_error_requests += other.total_error_requests;
         total_issued_requests += other.total_issued_requests;
+        cpu_utilization += other.cpu_utilization;
+        mem_utilization += other.mem_utilization;
+        application_utilization += other.application_utilization;
         for (const auto& p : other.load_metrics) {
           load_metrics[p.first] += p.second;
         }
@@ -662,6 +679,9 @@ class LrsServiceImpl
       uint64_t total_requests_in_progress = 0;
       uint64_t total_error_requests = 0;
       uint64_t total_issued_requests = 0;
+      LoadMetric cpu_utilization;
+      LoadMetric mem_utilization;
+      LoadMetric application_utilization;
       std::map<std::string, LoadMetric> load_metrics;
     };
 
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 994e038c983..4220bb664a0 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -3044,6 +3044,8 @@ src/core/xds/xds_client/lrs_client.cc \
 src/core/xds/xds_client/lrs_client.h \
 src/core/xds/xds_client/xds_api.cc \
 src/core/xds/xds_client/xds_api.h \
+src/core/xds/xds_client/xds_backend_metric_propagation.cc \
+src/core/xds/xds_client/xds_backend_metric_propagation.h \
 src/core/xds/xds_client/xds_bootstrap.cc \
 src/core/xds/xds_client/xds_bootstrap.h \
 src/core/xds/xds_client/xds_channel_args.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 3725bd86978..eae9a2e2ea4 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -2821,6 +2821,8 @@ src/core/xds/xds_client/lrs_client.cc \
 src/core/xds/xds_client/lrs_client.h \
 src/core/xds/xds_client/xds_api.cc \
 src/core/xds/xds_client/xds_api.h \
+src/core/xds/xds_client/xds_backend_metric_propagation.cc \
+src/core/xds/xds_client/xds_backend_metric_propagation.h \
 src/core/xds/xds_client/xds_bootstrap.cc \
 src/core/xds/xds_client/xds_bootstrap.h \
 src/core/xds/xds_client/xds_channel_args.h \

From 40ff7aa6178d243ae9431a875fb4050c4b2534a9 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 27 Sep 2024 11:31:31 -0700
Subject: [PATCH 07/74] [call-v3] Inline OperationExecutor methods (#37006)

These methods are very short and very inlinable. Further more the specializations are very infrequently repeated.

(I'm essentially hoisting code out of the .cc file and landing it in the .h file with the appropriate inlining annotations here)

Before:
```
----------------------------------------------------------------------------------------------------
Benchmark                                                          Time             CPU   Iterations
----------------------------------------------------------------------------------------------------
grpc_core::BM_UnaryWithSpawnPerEnd<CallSpineFixture>            1053 ns         1053 ns      2674404
grpc_core::BM_UnaryWithSpawnPerOp<CallSpineFixture>             1191 ns         1191 ns      2337068
grpc_core::BM_ClientToServerStreaming<CallSpineFixture>          243 ns          243 ns     11511112
grpc_core::BM_UnaryWithSpawnPerEnd<ForwardCallFixture>          2723 ns         2724 ns      1033990
grpc_core::BM_UnaryWithSpawnPerOp<ForwardCallFixture>           2930 ns         2931 ns       942815
grpc_core::BM_ClientToServerStreaming<ForwardCallFixture>        455 ns          455 ns      6213422
```

After:
```
----------------------------------------------------------------------------------------------------
Benchmark                                                          Time             CPU   Iterations
----------------------------------------------------------------------------------------------------
grpc_core::BM_UnaryWithSpawnPerEnd<CallSpineFixture>             986 ns          986 ns      2867870
grpc_core::BM_UnaryWithSpawnPerOp<CallSpineFixture>             1101 ns         1101 ns      2472611
grpc_core::BM_ClientToServerStreaming<CallSpineFixture>          220 ns          220 ns     12774397
grpc_core::BM_UnaryWithSpawnPerEnd<ForwardCallFixture>          2512 ns         2512 ns      1111667
grpc_core::BM_UnaryWithSpawnPerOp<ForwardCallFixture>           2743 ns         2744 ns      1008676
grpc_core::BM_ClientToServerStreaming<ForwardCallFixture>        420 ns          420 ns      6820805
```

Closes #37006

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37006 from ctiller:inline-filters 24903bd524ae5f4c97fe75318a3fcf73436ff6ea
PiperOrigin-RevId: 679666043
---
 src/core/lib/transport/call_filters.cc | 115 +------------------------
 src/core/lib/transport/call_filters.h  | 108 +++++++++++++++++++++--
 2 files changed, 104 insertions(+), 119 deletions(-)

diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc
index f15579db603..822c266b0b3 100644
--- a/src/core/lib/transport/call_filters.cc
+++ b/src/core/lib/transport/call_filters.cc
@@ -23,124 +23,13 @@
 #include "src/core/util/crash.h"
 
 namespace grpc_core {
-
-namespace filters_detail {
-
-void RunHalfClose(absl::Span<const HalfCloseOperator> ops, void* call_data) {
-  for (const auto& op : ops) {
-    op.half_close(Offset(call_data, op.call_offset), op.channel_data);
-  }
-}
-
-ServerMetadataHandle RunServerTrailingMetadata(
-    absl::Span<const ServerTrailingMetadataOperator> ops, void* call_data,
-    ServerMetadataHandle md) {
-  for (auto& op : ops) {
-    md = op.server_trailing_metadata(Offset(call_data, op.call_offset),
-                                     op.channel_data, std::move(md));
-  }
-  return md;
-}
-
-template <typename T>
-OperationExecutor<T>::~OperationExecutor() {
-  if (promise_data_ != nullptr) {
-    ops_->early_destroy(promise_data_);
-    gpr_free_aligned(promise_data_);
-  }
-}
-
-template <typename T>
-Poll<ResultOr<T>> OperationExecutor<T>::Start(const Layout<T>* layout, T input,
-                                              void* call_data) {
-  ops_ = layout->ops.data();
-  end_ops_ = ops_ + layout->ops.size();
-  if (layout->promise_size == 0) {
-    // No call state ==> instantaneously ready
-    auto r = InitStep(std::move(input), call_data);
-    CHECK(r.ready());
-    return r;
-  }
-  promise_data_ =
-      gpr_malloc_aligned(layout->promise_size, layout->promise_alignment);
-  return InitStep(std::move(input), call_data);
-}
-
-template <typename T>
-Poll<ResultOr<T>> OperationExecutor<T>::InitStep(T input, void* call_data) {
-  CHECK(input != nullptr);
-  while (true) {
-    if (ops_ == end_ops_) {
-      return ResultOr<T>{std::move(input), nullptr};
-    }
-    auto p =
-        ops_->promise_init(promise_data_, Offset(call_data, ops_->call_offset),
-                           ops_->channel_data, std::move(input));
-    if (auto* r = p.value_if_ready()) {
-      if (r->ok == nullptr) return std::move(*r);
-      input = std::move(r->ok);
-      ++ops_;
-      continue;
-    }
-    return Pending{};
-  }
-}
-
-template <typename T>
-Poll<ResultOr<T>> OperationExecutor<T>::Step(void* call_data) {
-  DCHECK_NE(promise_data_, nullptr);
-  auto p = ContinueStep(call_data);
-  if (p.ready()) {
-    gpr_free_aligned(promise_data_);
-    promise_data_ = nullptr;
-  }
-  return p;
-}
-
-template <typename T>
-Poll<ResultOr<T>> OperationExecutor<T>::ContinueStep(void* call_data) {
-  auto p = ops_->poll(promise_data_);
-  if (auto* r = p.value_if_ready()) {
-    if (r->ok == nullptr) return std::move(*r);
-    ++ops_;
-    return InitStep(std::move(r->ok), call_data);
-  }
-  return Pending{};
-}
-
-// Explicit instantiations of some types used in filters.h
-// We'll need to add ServerMetadataHandle to this when it becomes different
-// to ClientMetadataHandle
-template class OperationExecutor<ClientMetadataHandle>;
-template class OperationExecutor<MessageHandle>;
-
-}  // namespace filters_detail
-
-namespace {
 // Call data for those calls that don't have any call data
 // (we form pointers to this that aren't allowed to be nullptr)
-char g_empty_call_data;
-}  // namespace
+char CallFilters::g_empty_call_data_;
 
 ///////////////////////////////////////////////////////////////////////////////
 // CallFilters
 
-CallFilters::CallFilters(ClientMetadataHandle client_initial_metadata)
-    : call_data_(nullptr),
-      push_client_initial_metadata_(std::move(client_initial_metadata)) {}
-
-CallFilters::~CallFilters() {
-  if (call_data_ != nullptr && call_data_ != &g_empty_call_data) {
-    for (const auto& stack : stacks_) {
-      for (const auto& destructor : stack.stack->data_.filter_destructor) {
-        destructor.call_destroy(filters_detail::Offset(
-            call_data_, stack.call_data_offset + destructor.call_offset));
-      }
-    }
-    gpr_free_aligned(call_data_);
-  }
-}
-
 void CallFilters::Start() {
   CHECK_EQ(call_data_, nullptr);
   size_t call_data_alignment = 1;
@@ -161,7 +50,7 @@ void CallFilters::Start() {
   if (call_data_size != 0) {
     call_data_ = gpr_malloc_aligned(call_data_size, call_data_alignment);
   } else {
-    call_data_ = &g_empty_call_data;
+    call_data_ = &g_empty_call_data_;
   }
   for (const auto& stack : stacks_) {
     for (const auto& constructor : stack.stack->data_.filter_constructor) {
diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h
index fb64eb95eca..b1a54f5dfec 100644
--- a/src/core/lib/transport/call_filters.h
+++ b/src/core/lib/transport/call_filters.h
@@ -220,10 +220,22 @@ struct ServerTrailingMetadataOperator {
       void* call_data, void* channel_data, ServerMetadataHandle metadata);
 };
 
-void RunHalfClose(absl::Span<const HalfCloseOperator> ops, void* call_data);
-ServerMetadataHandle RunServerTrailingMetadata(
-    absl::Span<const ServerTrailingMetadataOperator> ops, void* call_data,
-    ServerMetadataHandle md);
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void RunHalfClose(
+    absl::Span<const HalfCloseOperator> ops, void* call_data) {
+  for (const auto& op : ops) {
+    op.half_close(Offset(call_data, op.call_offset), op.channel_data);
+  }
+}
+
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline ServerMetadataHandle
+RunServerTrailingMetadata(absl::Span<const ServerTrailingMetadataOperator> ops,
+                          void* call_data, ServerMetadataHandle md) {
+  for (auto& op : ops) {
+    md = op.server_trailing_metadata(Offset(call_data, op.call_offset),
+                                     op.channel_data, std::move(md));
+  }
+  return md;
+}
 
 // One call finalizer
 struct Finalizer {
@@ -1116,6 +1128,76 @@ class OperationExecutor {
   const Operator<T>* end_ops_;
 };
 
+template <typename T>
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline OperationExecutor<
+    T>::~OperationExecutor() {
+  if (promise_data_ != nullptr) {
+    ops_->early_destroy(promise_data_);
+    gpr_free_aligned(promise_data_);
+  }
+}
+
+template <typename T>
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<ResultOr<T>>
+OperationExecutor<T>::Start(const Layout<T>* layout, T input, void* call_data) {
+  ops_ = layout->ops.data();
+  end_ops_ = ops_ + layout->ops.size();
+  if (layout->promise_size == 0) {
+    // No call state ==> instantaneously ready
+    auto r = InitStep(std::move(input), call_data);
+    CHECK(r.ready());
+    return r;
+  }
+  promise_data_ =
+      gpr_malloc_aligned(layout->promise_size, layout->promise_alignment);
+  return InitStep(std::move(input), call_data);
+}
+
+template <typename T>
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<ResultOr<T>>
+OperationExecutor<T>::InitStep(T input, void* call_data) {
+  CHECK(input != nullptr);
+  while (true) {
+    if (ops_ == end_ops_) {
+      return ResultOr<T>{std::move(input), nullptr};
+    }
+    auto p =
+        ops_->promise_init(promise_data_, Offset(call_data, ops_->call_offset),
+                           ops_->channel_data, std::move(input));
+    if (auto* r = p.value_if_ready()) {
+      if (r->ok == nullptr) return std::move(*r);
+      input = std::move(r->ok);
+      ++ops_;
+      continue;
+    }
+    return Pending{};
+  }
+}
+
+template <typename T>
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<ResultOr<T>>
+OperationExecutor<T>::Step(void* call_data) {
+  DCHECK_NE(promise_data_, nullptr);
+  auto p = ContinueStep(call_data);
+  if (p.ready()) {
+    gpr_free_aligned(promise_data_);
+    promise_data_ = nullptr;
+  }
+  return p;
+}
+
+template <typename T>
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<ResultOr<T>>
+OperationExecutor<T>::ContinueStep(void* call_data) {
+  auto p = ops_->poll(promise_data_);
+  if (auto* r = p.value_if_ready()) {
+    if (r->ok == nullptr) return std::move(*r);
+    ++ops_;
+    return InitStep(std::move(r->ok), call_data);
+  }
+  return Pending{};
+}
+
 template <typename Fn>
 class ServerTrailingMetadataInterceptor {
  public:
@@ -1276,8 +1358,20 @@ class CallFilters {
     filters_detail::StackData data_;
   };
 
-  explicit CallFilters(ClientMetadataHandle client_initial_metadata);
-  ~CallFilters();
+  explicit CallFilters(ClientMetadataHandle client_initial_metadata)
+      : call_data_(nullptr),
+        push_client_initial_metadata_(std::move(client_initial_metadata)) {}
+  ~CallFilters() {
+    if (call_data_ != nullptr && call_data_ != &g_empty_call_data_) {
+      for (const auto& stack : stacks_) {
+        for (const auto& destructor : stack.stack->data_.filter_destructor) {
+          destructor.call_destroy(filters_detail::Offset(
+              call_data_, stack.call_data_offset + destructor.call_offset));
+        }
+      }
+      gpr_free_aligned(call_data_);
+    }
+  };
 
   CallFilters(const CallFilters&) = delete;
   CallFilters& operator=(const CallFilters&) = delete;
@@ -1528,6 +1622,8 @@ class CallFilters {
   MessageHandle push_client_to_server_message_;
   MessageHandle push_server_to_client_message_;
   ServerMetadataHandle push_server_trailing_metadata_;
+
+  static char g_empty_call_data_;
 };
 
 }  // namespace grpc_core

From 6dbc0bdb106b3b2c319198194ca7b6f18d88f8ff Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 27 Sep 2024 12:20:36 -0700
Subject: [PATCH 08/74] [chaotic-good] Use a party for internal activities
 (#37078)

Allows use of the party <-> party wakeup batching stuff, which reduces threadhops drastically for this transport.

Closes #37078

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37078 from ctiller:chaotic-party-3 75c32e6a6467f41e24d3786980a4aed3e8c93a4c
PiperOrigin-RevId: 679685211
---
 src/core/BUILD                                |  7 +--
 .../chaotic_good/client_transport.cc          | 45 ++++++-------------
 .../transport/chaotic_good/client_transport.h |  6 +--
 .../chaotic_good/server_transport.cc          | 33 +++++++-------
 .../transport/chaotic_good/server_transport.h |  3 +-
 src/core/lib/promise/party.cc                 | 21 ++++++---
 src/core/lib/promise/party.h                  |  2 +
 .../chaotic_good/client_transport_test.cc     | 12 ++---
 .../chaotic_good/mock_promise_endpoint.h      | 15 +++++++
 .../chaotic_good/server_transport_test.cc     |  4 +-
 10 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/src/core/BUILD b/src/core/BUILD
index 13091d6bd38..a7ae31fe639 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -7946,7 +7946,7 @@ grpc_cc_library(
         "absl/base:core_headers",
         "absl/container:flat_hash_map",
         "absl/log:check",
-        "absl/log:log",
+        "absl/log",
         "absl/random",
         "absl/random:bit_gen_ref",
         "absl/status",
@@ -7957,20 +7957,18 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "activity",
-        "all_ok",
         "arena",
         "chaotic_good_frame",
         "chaotic_good_frame_header",
         "chaotic_good_transport",
         "context",
-        "event_engine_wakeup_scheduler",
+        "event_engine_context",
         "for_each",
         "grpc_promise_endpoint",
         "if",
         "inter_activity_pipe",
         "loop",
         "map",
-        "match",
         "memory_quota",
         "metadata_batch",
         "mpsc",
@@ -7987,7 +7985,6 @@ grpc_cc_library(
         "//:grpc_base",
         "//:hpack_encoder",
         "//:hpack_parser",
-        "//:promise",
         "//:ref_counted_ptr",
     ],
 )
diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc
index 17aff601d45..28af0d5ba98 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good/client_transport.cc
@@ -36,22 +36,15 @@
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
+#include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/promise/activity.h"
-#include "src/core/lib/promise/all_ok.h"
-#include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
 #include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/map.h"
-#include "src/core/lib/promise/promise.h"
-#include "src/core/lib/promise/try_join.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
-#include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
-#include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/promise_endpoint.h"
-#include "src/core/util/match.h"
 #include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
@@ -59,15 +52,12 @@ namespace chaotic_good {
 
 void ChaoticGoodClientTransport::Orphan() {
   AbortWithError();
-  ActivityPtr writer;
-  ActivityPtr reader;
+  RefCountedPtr<Party> party;
   {
     MutexLock lock(&mu_);
-    writer = std::move(writer_);
-    reader = std::move(reader_);
+    party = std::move(party_);
   }
-  writer.reset();
-  reader.reset();
+  party.reset();
   Unref();
 }
 
@@ -211,25 +201,18 @@ ChaoticGoodClientTransport::ChaoticGoodClientTransport(
   auto transport = MakeRefCounted<ChaoticGoodTransport>(
       std::move(control_endpoint), std::move(data_endpoint),
       std::move(hpack_parser), std::move(hpack_encoder));
-  writer_ = MakeActivity(
-      // Continuously write next outgoing frames to promise endpoints.
-      TransportWriteLoop(transport), EventEngineWakeupScheduler(event_engine),
-      OnTransportActivityDone("write_loop"));
-  reader_ = MakeActivity(
-      // Continuously read next incoming frames from promise endpoints.
-      TransportReadLoop(std::move(transport)),
-      EventEngineWakeupScheduler(event_engine),
-      OnTransportActivityDone("read_loop"));
+  auto party_arena = SimpleArenaAllocator(0)->MakeArena();
+  party_arena->SetContext<grpc_event_engine::experimental::EventEngine>(
+      event_engine.get());
+  party_ = Party::Make(std::move(party_arena));
+  party_->Spawn("client-chaotic-writer", TransportWriteLoop(transport),
+                OnTransportActivityDone("write_loop"));
+  party_->Spawn("client-chaotic-reader",
+                TransportReadLoop(std::move(transport)),
+                OnTransportActivityDone("read_loop"));
 }
 
-ChaoticGoodClientTransport::~ChaoticGoodClientTransport() {
-  if (writer_ != nullptr) {
-    writer_.reset();
-  }
-  if (reader_ != nullptr) {
-    reader_.reset();
-  }
-}
+ChaoticGoodClientTransport::~ChaoticGoodClientTransport() { party_.reset(); }
 
 void ChaoticGoodClientTransport::AbortWithError() {
   // Mark transport as unavailable when the endpoint write/read failed.
diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h
index 8f2941947d3..f223c551002 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.h
+++ b/src/core/ext/transport/chaotic_good/client_transport.h
@@ -88,9 +88,6 @@ class ChaoticGoodClientTransport final : public ClientTransport {
   void AbortWithError();
 
  private:
-  // Queue size of each stream pipe is set to 2, so that for each stream read it
-  // will queue at most 2 frames.
-  static const size_t kServerFrameQueueSize = 2;
   using StreamMap = absl::flat_hash_map<uint32_t, CallHandler>;
 
   uint32_t MakeStream(CallHandler call_handler);
@@ -112,8 +109,7 @@ class ChaoticGoodClientTransport final : public ClientTransport {
   uint32_t next_stream_id_ ABSL_GUARDED_BY(mu_) = 1;
   // Map of stream incoming server frames, key is stream_id.
   StreamMap stream_map_ ABSL_GUARDED_BY(mu_);
-  ActivityPtr writer_;
-  ActivityPtr reader_;
+  RefCountedPtr<Party> party_;
   ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(mu_){
       "chaotic_good_client", GRPC_CHANNEL_READY};
 };
diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index 4110af2fbcc..6588227a264 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -356,12 +356,14 @@ ChaoticGoodServerTransport::ChaoticGoodServerTransport(
   auto transport = MakeRefCounted<ChaoticGoodTransport>(
       std::move(control_endpoint), std::move(data_endpoint),
       std::move(hpack_parser), std::move(hpack_encoder));
-  writer_ = MakeActivity(TransportWriteLoop(transport),
-                         EventEngineWakeupScheduler(event_engine),
-                         OnTransportActivityDone("writer"));
-  reader_ = MakeActivity(TransportReadLoop(std::move(transport)),
-                         EventEngineWakeupScheduler(event_engine),
-                         OnTransportActivityDone("reader"));
+  auto party_arena = SimpleArenaAllocator(0)->MakeArena();
+  party_arena->SetContext<grpc_event_engine::experimental::EventEngine>(
+      event_engine.get());
+  party_ = Party::Make(std::move(party_arena));
+  party_->Spawn("server-chaotic-writer", TransportWriteLoop(transport),
+                OnTransportActivityDone("writer"));
+  party_->Spawn("server-chaotic-reader", TransportReadLoop(transport),
+                OnTransportActivityDone("reader"));
 }
 
 void ChaoticGoodServerTransport::SetCallDestination(
@@ -373,15 +375,13 @@ void ChaoticGoodServerTransport::SetCallDestination(
 }
 
 void ChaoticGoodServerTransport::Orphan() {
-  ActivityPtr writer;
-  ActivityPtr reader;
+  AbortWithError();
+  RefCountedPtr<Party> party;
   {
     MutexLock lock(&mu_);
-    writer = std::move(writer_);
-    reader = std::move(reader_);
+    party = std::move(party_);
   }
-  writer.reset();
-  reader.reset();
+  party.reset();
   Unref();
 }
 
@@ -461,7 +461,7 @@ absl::Status ChaoticGoodServerTransport::NewStream(
 }
 
 void ChaoticGoodServerTransport::PerformOp(grpc_transport_op* op) {
-  std::vector<ActivityPtr> cancelled;
+  RefCountedPtr<Party> cancelled_party;
   MutexLock lock(&mu_);
   bool did_stuff = false;
   if (op->start_connectivity_watch != nullptr) {
@@ -482,8 +482,11 @@ void ChaoticGoodServerTransport::PerformOp(grpc_transport_op* op) {
     did_stuff = true;
   }
   if (!op->goaway_error.ok() || !op->disconnect_with_error.ok()) {
-    cancelled.push_back(std::move(writer_));
-    cancelled.push_back(std::move(reader_));
+    cancelled_party = std::move(party_);
+    outgoing_frames_.MarkClosed();
+    state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN,
+                            absl::UnavailableError("transport closed"),
+                            "transport closed");
     did_stuff = true;
   }
   if (!did_stuff) {
diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h
index 23909768b68..d8244ab32fe 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.h
+++ b/src/core/ext/transport/chaotic_good/server_transport.h
@@ -146,8 +146,7 @@ class ChaoticGoodServerTransport final : public ServerTransport {
   // Map of stream incoming server frames, key is stream_id.
   StreamMap stream_map_ ABSL_GUARDED_BY(mu_);
   uint32_t last_seen_new_stream_id_ = 0;
-  ActivityPtr writer_ ABSL_GUARDED_BY(mu_);
-  ActivityPtr reader_ ABSL_GUARDED_BY(mu_);
+  RefCountedPtr<Party> party_;
   ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(mu_){
       "chaotic_good_server", GRPC_CHANNEL_READY};
 };
diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc
index cfc34ebedee..79c310c9806 100644
--- a/src/core/lib/promise/party.cc
+++ b/src/core/lib/promise/party.cc
@@ -149,15 +149,24 @@ Party::Participant::~Participant() {
 Party::~Party() {}
 
 void Party::CancelRemainingParticipants() {
-  if ((state_.load(std::memory_order_relaxed) & kAllocatedMask) == 0) return;
+  uint64_t prev_state = state_.load(std::memory_order_relaxed);
+  if ((prev_state & kAllocatedMask) == 0) return;
   ScopedActivity activity(this);
   promise_detail::Context<Arena> arena_ctx(arena_.get());
-  for (size_t i = 0; i < party_detail::kMaxParticipants; i++) {
-    if (auto* p =
-            participants_[i].exchange(nullptr, std::memory_order_acquire)) {
-      p->Destroy();
+  uint64_t clear_state = 0;
+  do {
+    for (size_t i = 0; i < party_detail::kMaxParticipants; i++) {
+      if (auto* p =
+              participants_[i].exchange(nullptr, std::memory_order_acquire)) {
+        clear_state |= 1ull << i << kAllocatedShift;
+        p->Destroy();
+      }
     }
-  }
+    if (clear_state == 0) return;
+  } while (!state_.compare_exchange_weak(prev_state, prev_state & ~clear_state,
+                                         std::memory_order_acq_rel));
+  LogStateChange("CancelRemainingParticipants", prev_state,
+                 prev_state & ~clear_state);
 }
 
 std::string Party::ActivityDebugTag(WakeupMask wakeup_mask) const {
diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h
index a38467a924b..d2051aa6083 100644
--- a/src/core/lib/promise/party.h
+++ b/src/core/lib/promise/party.h
@@ -430,12 +430,14 @@ void Party::BulkSpawner::Spawn(absl::string_view name, Factory promise_factory,
 template <typename Factory, typename OnComplete>
 void Party::Spawn(absl::string_view name, Factory promise_factory,
                   OnComplete on_complete) {
+  GRPC_TRACE_LOG(party_state, INFO) << "PARTY[" << this << "]: spawn " << name;
   AddParticipant(new ParticipantImpl<Factory, OnComplete>(
       name, std::move(promise_factory), std::move(on_complete)));
 }
 
 template <typename Factory>
 auto Party::SpawnWaitable(absl::string_view name, Factory promise_factory) {
+  GRPC_TRACE_LOG(party_state, INFO) << "PARTY[" << this << "]: spawn " << name;
   auto participant = MakeRefCounted<PromiseParticipantImpl<Factory>>(
       name, std::move(promise_factory));
   Participant* p = participant->Ref().release();
diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc
index d4f7037b733..aad18ee1601 100644
--- a/test/core/transport/chaotic_good/client_transport_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_test.cc
@@ -102,8 +102,8 @@ ChannelArgs MakeChannelArgs() {
 }
 
 TEST_F(TransportTest, AddOneStream) {
-  MockPromiseEndpoint control_endpoint;
-  MockPromiseEndpoint data_endpoint;
+  MockPromiseEndpoint control_endpoint(1000);
+  MockPromiseEndpoint data_endpoint(1001);
   control_endpoint.ExpectRead(
       {SerializedFrameHeader(FrameType::kFragment, 7, 1, 26, 8, 56, 15),
        EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
@@ -120,7 +120,6 @@ TEST_F(TransportTest, AddOneStream) {
       std::move(data_endpoint.promise_endpoint), MakeChannelArgs(),
       event_engine(), HPackParser(), HPackCompressor());
   auto call = MakeCall(TestInitialMetadata());
-  transport->StartCall(call.handler.StartCall());
   StrictMock<MockFunction<void()>> on_done;
   EXPECT_CALL(on_done, Call());
   control_endpoint.ExpectWrite(
@@ -136,6 +135,7 @@ TEST_F(TransportTest, AddOneStream) {
       {EventEngineSlice::FromCopiedString("0"), Zeros(63)}, nullptr);
   control_endpoint.ExpectWrite(
       {SerializedFrameHeader(FrameType::kFragment, 4, 1, 0, 0, 0, 0)}, nullptr);
+  transport->StartCall(call.handler.StartCall());
   call.initiator.SpawnGuarded("test-send",
                               [initiator = call.initiator]() mutable {
                                 return SendClientToServerMessages(initiator, 1);
@@ -183,8 +183,8 @@ TEST_F(TransportTest, AddOneStream) {
 }
 
 TEST_F(TransportTest, AddOneStreamMultipleMessages) {
-  MockPromiseEndpoint control_endpoint;
-  MockPromiseEndpoint data_endpoint;
+  MockPromiseEndpoint control_endpoint(1000);
+  MockPromiseEndpoint data_endpoint(1001);
   control_endpoint.ExpectRead(
       {SerializedFrameHeader(FrameType::kFragment, 3, 1, 26, 8, 56, 0),
        EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
@@ -206,7 +206,6 @@ TEST_F(TransportTest, AddOneStreamMultipleMessages) {
       std::move(data_endpoint.promise_endpoint), MakeChannelArgs(),
       event_engine(), HPackParser(), HPackCompressor());
   auto call = MakeCall(TestInitialMetadata());
-  transport->StartCall(call.handler.StartCall());
   StrictMock<MockFunction<void()>> on_done;
   EXPECT_CALL(on_done, Call());
   control_endpoint.ExpectWrite(
@@ -227,6 +226,7 @@ TEST_F(TransportTest, AddOneStreamMultipleMessages) {
       {EventEngineSlice::FromCopiedString("1"), Zeros(63)}, nullptr);
   control_endpoint.ExpectWrite(
       {SerializedFrameHeader(FrameType::kFragment, 4, 1, 0, 0, 0, 0)}, nullptr);
+  transport->StartCall(call.handler.StartCall());
   call.initiator.SpawnGuarded("test-send",
                               [initiator = call.initiator]() mutable {
                                 return SendClientToServerMessages(initiator, 2);
diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.h b/test/core/transport/chaotic_good/mock_promise_endpoint.h
index d90133feb9d..bf073e4644f 100644
--- a/test/core/transport/chaotic_good/mock_promise_endpoint.h
+++ b/test/core/transport/chaotic_good/mock_promise_endpoint.h
@@ -20,6 +20,7 @@
 
 #include <grpc/event_engine/event_engine.h>
 
+#include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/transport/promise_endpoint.h"
 
 namespace grpc_core {
@@ -54,6 +55,20 @@ class MockEndpoint
 };
 
 struct MockPromiseEndpoint {
+  explicit MockPromiseEndpoint(int port) {
+    if (GRPC_TRACE_FLAG_ENABLED(chaotic_good)) {
+      EXPECT_CALL(*endpoint, GetPeerAddress)
+          .WillRepeatedly(
+              [peer_address =
+                   std::make_shared<grpc_event_engine::experimental::
+                                        EventEngine::ResolvedAddress>(
+                       grpc_event_engine::experimental::URIToResolvedAddress(
+                           absl::StrCat("ipv4:127.0.0.1:", port))
+                           .value())]()
+                  -> const grpc_event_engine::experimental::EventEngine::
+                      ResolvedAddress& { return *peer_address; });
+    }
+  }
   ::testing::StrictMock<MockEndpoint>* endpoint =
       new ::testing::StrictMock<MockEndpoint>();
   PromiseEndpoint promise_endpoint = PromiseEndpoint(
diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc
index af5b223c2fb..f3ab7f3a350 100644
--- a/test/core/transport/chaotic_good/server_transport_test.cc
+++ b/test/core/transport/chaotic_good/server_transport_test.cc
@@ -91,8 +91,8 @@ class MockCallDestination : public UnstartedCallDestination {
 };
 
 TEST_F(TransportTest, ReadAndWriteOneMessage) {
-  MockPromiseEndpoint control_endpoint;
-  MockPromiseEndpoint data_endpoint;
+  MockPromiseEndpoint control_endpoint(1);
+  MockPromiseEndpoint data_endpoint(2);
   auto call_destination = MakeRefCounted<StrictMock<MockCallDestination>>();
   EXPECT_CALL(*call_destination, Orphaned()).Times(1);
   auto transport = MakeOrphanable<ChaoticGoodServerTransport>(

From e56d766a45a61e6b476958ad0bb68e2d022dcfbb Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 27 Sep 2024 13:23:29 -0700
Subject: [PATCH 09/74] [GCP auth filter] add "blackboard" mechanism for
 retaining global state, and use it for cache in GCP auth filter (#37646)

This is the last piece of gRFC A83 (https://github.com/grpc/proposal/pull/438).

Note that although this is the first use-case for this "blackboard" mechanism, we will also use it in the future for the xDS rate-limiting filter on the gRPC server side.

Closes #37646

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37646 from markdroth:gcp_auth_filter_state 72d0d96c79f1576a0085f1887829ffcab93fe5ff
PiperOrigin-RevId: 679707134
---
 BUILD                                         |  2 +
 CMakeLists.txt                                | 62 ++++++++++++++++
 Makefile                                      |  1 +
 Package.swift                                 |  2 +
 build_autogenerated.yaml                      | 57 +++++++++++++++
 config.m4                                     |  2 +
 config.w32                                    |  2 +
 gRPC-C++.podspec                              |  2 +
 gRPC-Core.podspec                             |  3 +
 grpc.gemspec                                  |  2 +
 package.xml                                   |  2 +
 src/core/BUILD                                | 24 +++++++
 src/core/client_channel/client_channel.cc     |  7 +-
 src/core/client_channel/client_channel.h      |  3 +
 .../client_channel/client_channel_filter.cc   |  7 +-
 .../client_channel/client_channel_filter.h    |  3 +
 src/core/client_channel/dynamic_filters.cc    | 12 ++--
 src/core/client_channel/dynamic_filters.h     |  4 +-
 .../gcp_authentication_filter.cc              | 62 ++++++++++++----
 .../gcp_authentication_filter.h               | 32 ++++++---
 src/core/filter/blackboard.cc                 | 33 +++++++++
 src/core/filter/blackboard.h                  | 71 +++++++++++++++++++
 src/core/lib/channel/channel_stack.cc         |  5 +-
 src/core/lib/channel/channel_stack.h          | 17 ++---
 .../lib/channel/channel_stack_builder_impl.cc |  2 +-
 .../lib/channel/channel_stack_builder_impl.h  | 13 ++++
 src/core/lib/channel/promise_based_filter.h   | 39 ++++++++--
 src/core/lib/transport/interception_chain.h   | 17 +++--
 src/core/util/lru_cache.h                     | 36 +++++++---
 src/python/grpcio/grpc_core_dependencies.py   |  1 +
 test/core/filters/BUILD                       | 13 ++++
 test/core/filters/blackboard_test.cc          | 66 +++++++++++++++++
 test/core/util/lru_cache_test.cc              | 33 +++++++++
 .../end2end/xds/xds_gcp_authn_end2end_test.cc | 69 ++++++++++++++++++
 tools/doxygen/Doxyfile.c++.internal           |  2 +
 tools/doxygen/Doxyfile.core.internal          |  2 +
 tools/run_tests/generated/tests.json          | 24 +++++++
 37 files changed, 675 insertions(+), 59 deletions(-)
 create mode 100644 src/core/filter/blackboard.cc
 create mode 100644 src/core/filter/blackboard.h
 create mode 100644 test/core/filters/blackboard_test.cc

diff --git a/BUILD b/BUILD
index 17b278b61e6..c2d1c88a7d6 100644
--- a/BUILD
+++ b/BUILD
@@ -2043,6 +2043,7 @@ grpc_cc_library(
         "//src/core:arena_promise",
         "//src/core:atomic_utils",
         "//src/core:bitset",
+        "//src/core:blackboard",
         "//src/core:call_destination",
         "//src/core:call_filters",
         "//src/core:call_final_info",
@@ -3780,6 +3781,7 @@ grpc_cc_library(
         "//src/core:arena",
         "//src/core:arena_promise",
         "//src/core:backend_metric_parser",
+        "//src/core:blackboard",
         "//src/core:call_destination",
         "//src/core:call_filters",
         "//src/core:call_spine",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3836f7beac9..ec604861f22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -960,6 +960,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx binder_server_test)
   add_dependencies(buildtests_cxx binder_transport_test)
   add_dependencies(buildtests_cxx bitset_test)
+  add_dependencies(buildtests_cxx blackboard_test)
   add_dependencies(buildtests_cxx buffer_list_test)
   add_dependencies(buildtests_cxx byte_buffer_test)
   add_dependencies(buildtests_cxx c_slice_buffer_test)
@@ -2246,6 +2247,7 @@ add_library(grpc
   src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
   src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
   src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
+  src/core/filter/blackboard.cc
   src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
   src/core/handshaker/handshaker.cc
   src/core/handshaker/handshaker_registry.cc
@@ -3053,6 +3055,7 @@ add_library(grpc_unsecure
   src/core/ext/upb-gen/validate/validate.upb_minitable.c
   src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c
   src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c
+  src/core/filter/blackboard.cc
   src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
   src/core/handshaker/handshaker.cc
   src/core/handshaker/handshaker_registry.cc
@@ -5280,6 +5283,7 @@ add_library(grpc_authorization_provider
   src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
   src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
   src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
+  src/core/filter/blackboard.cc
   src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
   src/core/handshaker/handshaker.cc
   src/core/handshaker/handshaker_registry.cc
@@ -8406,6 +8410,63 @@ target_link_libraries(bitset_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(blackboard_test
+  src/core/filter/blackboard.cc
+  src/core/lib/address_utils/sockaddr_utils.cc
+  src/core/lib/channel/channel_args.cc
+  src/core/lib/iomgr/sockaddr_utils_posix.cc
+  src/core/lib/iomgr/socket_utils_windows.cc
+  src/core/lib/surface/channel_stack_type.cc
+  src/core/resolver/endpoint_addresses.cc
+  src/core/util/ref_counted_string.cc
+  src/core/util/time.cc
+  src/core/util/uri.cc
+  test/core/filters/blackboard_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(blackboard_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(blackboard_test PUBLIC cxx_std_14)
+target_include_directories(blackboard_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(blackboard_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::config
+  absl::flat_hash_map
+  absl::function_ref
+  absl::hash
+  absl::type_traits
+  absl::statusor
+  gpr
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -9012,6 +9073,7 @@ add_executable(call_utils_test
   src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
   src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
   src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
+  src/core/filter/blackboard.cc
   src/core/handshaker/handshaker_registry.cc
   src/core/handshaker/proxy_mapper_registry.cc
   src/core/lib/address_utils/parse_address.cc
diff --git a/Makefile b/Makefile
index 70828125ba2..078484c1fd6 100644
--- a/Makefile
+++ b/Makefile
@@ -1057,6 +1057,7 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
     src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
     src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
+    src/core/filter/blackboard.cc \
     src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
     src/core/handshaker/handshaker.cc \
     src/core/handshaker/handshaker_registry.cc \
diff --git a/Package.swift b/Package.swift
index 8b1ae1392cc..c21dedc5f8b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1070,6 +1070,8 @@ let package = Package(
         "src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h",
         "src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c",
         "src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h",
+        "src/core/filter/blackboard.cc",
+        "src/core/filter/blackboard.h",
         "src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc",
         "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h",
         "src/core/handshaker/handshaker.cc",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 33b9da00c33..b45eb26192f 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -781,6 +781,7 @@ libs:
   - src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h
   - src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h
   - src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h
+  - src/core/filter/blackboard.h
   - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h
   - src/core/handshaker/handshaker.h
   - src/core/handshaker/handshaker_factory.h
@@ -1662,6 +1663,7 @@ libs:
   - src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c
   - src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c
   - src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c
+  - src/core/filter/blackboard.cc
   - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
   - src/core/handshaker/handshaker.cc
   - src/core/handshaker/handshaker_registry.cc
@@ -2359,6 +2361,7 @@ libs:
   - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.h
   - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb.h
   - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.h
+  - src/core/filter/blackboard.h
   - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h
   - src/core/handshaker/handshaker.h
   - src/core/handshaker/handshaker_factory.h
@@ -2819,6 +2822,7 @@ libs:
   - src/core/ext/upb-gen/validate/validate.upb_minitable.c
   - src/core/ext/upb-gen/xds/data/orca/v3/orca_load_report.upb_minitable.c
   - src/core/ext/upb-gen/xds/service/orca/v3/orca.upb_minitable.c
+  - src/core/filter/blackboard.cc
   - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
   - src/core/handshaker/handshaker.cc
   - src/core/handshaker/handshaker_registry.cc
@@ -4467,6 +4471,7 @@ libs:
   - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
   - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
   - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
+  - src/core/filter/blackboard.h
   - src/core/handshaker/endpoint_info/endpoint_info_handshaker.h
   - src/core/handshaker/handshaker.h
   - src/core/handshaker/handshaker_factory.h
@@ -4803,6 +4808,7 @@ libs:
   - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
   - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
   - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
+  - src/core/filter/blackboard.cc
   - src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
   - src/core/handshaker/handshaker.cc
   - src/core/handshaker/handshaker_registry.cc
@@ -6278,6 +6284,55 @@ targets:
   - absl/log:check
   - absl/numeric:bits
   uses_polling: false
+- name: blackboard_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/filter/blackboard.h
+  - src/core/lib/address_utils/sockaddr_utils.h
+  - src/core/lib/channel/channel_args.h
+  - src/core/lib/iomgr/port.h
+  - src/core/lib/iomgr/resolved_address.h
+  - src/core/lib/iomgr/sockaddr.h
+  - src/core/lib/iomgr/sockaddr_posix.h
+  - src/core/lib/iomgr/sockaddr_windows.h
+  - src/core/lib/iomgr/socket_utils.h
+  - src/core/lib/surface/channel_stack_type.h
+  - src/core/resolver/endpoint_addresses.h
+  - src/core/util/atomic_utils.h
+  - src/core/util/avl.h
+  - src/core/util/down_cast.h
+  - src/core/util/dual_ref_counted.h
+  - src/core/util/orphanable.h
+  - src/core/util/ref_counted.h
+  - src/core/util/ref_counted_ptr.h
+  - src/core/util/ref_counted_string.h
+  - src/core/util/time.h
+  - src/core/util/unique_type_name.h
+  - src/core/util/uri.h
+  src:
+  - src/core/filter/blackboard.cc
+  - src/core/lib/address_utils/sockaddr_utils.cc
+  - src/core/lib/channel/channel_args.cc
+  - src/core/lib/iomgr/sockaddr_utils_posix.cc
+  - src/core/lib/iomgr/socket_utils_windows.cc
+  - src/core/lib/surface/channel_stack_type.cc
+  - src/core/resolver/endpoint_addresses.cc
+  - src/core/util/ref_counted_string.cc
+  - src/core/util/time.cc
+  - src/core/util/uri.cc
+  - test/core/filters/blackboard_test.cc
+  deps:
+  - gtest
+  - absl/base:config
+  - absl/container:flat_hash_map
+  - absl/functional:function_ref
+  - absl/hash:hash
+  - absl/meta:type_traits
+  - absl/status:statusor
+  - gpr
+  uses_polling: false
 - name: buffer_list_test
   gtest: true
   build: test
@@ -6738,6 +6793,7 @@ targets:
   - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
   - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
   - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
+  - src/core/filter/blackboard.h
   - src/core/handshaker/handshaker_factory.h
   - src/core/handshaker/handshaker_registry.h
   - src/core/handshaker/proxy_mapper.h
@@ -7043,6 +7099,7 @@ targets:
   - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
   - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
   - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
+  - src/core/filter/blackboard.cc
   - src/core/handshaker/handshaker_registry.cc
   - src/core/handshaker/proxy_mapper_registry.cc
   - src/core/lib/address_utils/parse_address.cc
diff --git a/config.m4 b/config.m4
index a5d57181f70..ae67f344840 100644
--- a/config.m4
+++ b/config.m4
@@ -432,6 +432,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c \
     src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
     src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
+    src/core/filter/blackboard.cc \
     src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
     src/core/handshaker/handshaker.cc \
     src/core/handshaker/handshaker_registry.cc \
@@ -1528,6 +1529,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/core/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/matcher/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/xds/type/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/filter)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/endpoint_info)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/handshaker/http_connect)
diff --git a/config.w32 b/config.w32
index c0acf9bfb23..94e02c3e172 100644
--- a/config.w32
+++ b/config.w32
@@ -397,6 +397,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\cel.upbdefs.c " +
     "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\range.upbdefs.c " +
     "src\\core\\ext\\upbdefs-gen\\xds\\type\\v3\\typed_struct.upbdefs.c " +
+    "src\\core\\filter\\blackboard.cc " +
     "src\\core\\handshaker\\endpoint_info\\endpoint_info_handshaker.cc " +
     "src\\core\\handshaker\\handshaker.cc " +
     "src\\core\\handshaker\\handshaker_registry.cc " +
@@ -1666,6 +1667,7 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\matcher\\v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\xds\\type\\v3");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\filter");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\endpoint_info");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\handshaker\\http_connect");
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 481f51c2ea4..a63753dd7d1 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -870,6 +870,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
                       'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
                       'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
+                      'src/core/filter/blackboard.h',
                       'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
                       'src/core/handshaker/handshaker.h',
                       'src/core/handshaker/handshaker_factory.h',
@@ -2173,6 +2174,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
                               'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
                               'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
+                              'src/core/filter/blackboard.h',
                               'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
                               'src/core/handshaker/handshaker.h',
                               'src/core/handshaker/handshaker_factory.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 2867cb57323..5eda92de512 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1190,6 +1190,8 @@ Pod::Spec.new do |s|
                       'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
                       'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c',
                       'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
+                      'src/core/filter/blackboard.cc',
+                      'src/core/filter/blackboard.h',
                       'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc',
                       'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
                       'src/core/handshaker/handshaker.cc',
@@ -2960,6 +2962,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.h',
                               'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h',
                               'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h',
+                              'src/core/filter/blackboard.h',
                               'src/core/handshaker/endpoint_info/endpoint_info_handshaker.h',
                               'src/core/handshaker/handshaker.h',
                               'src/core/handshaker/handshaker_factory.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index bd39eda2bda..3ba44548b25 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1076,6 +1076,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h )
   s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c )
   s.files += %w( src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h )
+  s.files += %w( src/core/filter/blackboard.cc )
+  s.files += %w( src/core/filter/blackboard.h )
   s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc )
   s.files += %w( src/core/handshaker/endpoint_info/endpoint_info_handshaker.h )
   s.files += %w( src/core/handshaker/handshaker.cc )
diff --git a/package.xml b/package.xml
index befa4e97aa3..76be79fd6b5 100644
--- a/package.xml
+++ b/package.xml
@@ -1058,6 +1058,8 @@
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/filter/blackboard.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/filter/blackboard.h" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/endpoint_info/endpoint_info_handshaker.h" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/handshaker.cc" role="src" />
diff --git a/src/core/BUILD b/src/core/BUILD
index a7ae31fe639..0de80c1f68a 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -3309,6 +3309,29 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "blackboard",
+    srcs = [
+        "filter/blackboard.cc",
+    ],
+    hdrs = [
+        "filter/blackboard.h",
+    ],
+    external_deps = [
+        "absl/container:flat_hash_map",
+        "absl/strings",
+    ],
+    language = "c++",
+    deps = [
+        "ref_counted",
+        "unique_type_name",
+        "useful",
+        "//:debug_location",
+        "//:endpoint_addresses",
+        "//:ref_counted_ptr",
+    ],
+)
+
 grpc_cc_library(
     name = "subchannel_connector",
     hdrs = [
@@ -5034,6 +5057,7 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "arena",
+        "blackboard",
         "channel_args",
         "channel_fwd",
         "context",
diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc
index bf87078b474..0d12c4b292a 100644
--- a/src/core/client_channel/client_channel.cc
+++ b/src/core/client_channel/client_channel.cc
@@ -1279,8 +1279,12 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked(
     config_selector =
         MakeRefCounted<DefaultConfigSelector>(saved_service_config_);
   }
+  // Modify channel args.
+  ChannelArgs new_args = args.SetObject(this).SetObject(saved_service_config_);
   // Construct filter stack.
-  InterceptionChainBuilder builder(args.SetObject(this));
+  auto new_blackboard = MakeRefCounted<Blackboard>();
+  InterceptionChainBuilder builder(new_args, blackboard_.get(),
+                                   new_blackboard.get());
   if (idle_timeout_ != Duration::Zero()) {
     builder.AddOnServerTrailingMetadata([this](ServerMetadata&) {
       if (idle_state_.DecreaseCallCount()) StartIdleTimer();
@@ -1300,6 +1304,7 @@ void ClientChannel::UpdateServiceConfigInDataPlaneLocked(
   }
   // Create call destination.
   auto top_of_stack_call_destination = builder.Build(call_destination_);
+  blackboard_ = std::move(new_blackboard);
   // Send result to data plane.
   if (!top_of_stack_call_destination.ok()) {
     resolver_data_for_calls_.Set(MaybeRewriteIllegalStatusCode(
diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h
index f268f6bfcb7..a7f7d75c705 100644
--- a/src/core/client_channel/client_channel.h
+++ b/src/core/client_channel/client_channel.h
@@ -27,6 +27,7 @@
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/ext/filters/channel_idle/idle_filter_state.h"
+#include "src/core/filter/blackboard.h"
 #include "src/core/lib/promise/observable.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/transport/metadata.h"
@@ -215,6 +216,8 @@ class ClientChannel : public Channel {
       ABSL_GUARDED_BY(*work_serializer_);
   RefCountedPtr<ConfigSelector> saved_config_selector_
       ABSL_GUARDED_BY(*work_serializer_);
+  RefCountedPtr<const Blackboard> blackboard_
+      ABSL_GUARDED_BY(*work_serializer_);
   OrphanablePtr<LoadBalancingPolicy> lb_policy_
       ABSL_GUARDED_BY(*work_serializer_);
   RefCountedPtr<SubchannelPoolInterface> subchannel_pool_
diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc
index 8bedc588914..82caeb27ffc 100644
--- a/src/core/client_channel/client_channel_filter.cc
+++ b/src/core/client_channel/client_channel_filter.cc
@@ -1498,6 +1498,7 @@ void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked(
     config_selector =
         MakeRefCounted<DefaultConfigSelector>(saved_service_config_);
   }
+  // Modify channel args.
   ChannelArgs new_args = args.SetObject(this).SetObject(service_config);
   bool enable_retries =
       !new_args.WantMinimalStack() &&
@@ -1510,9 +1511,11 @@ void ClientChannelFilter::UpdateServiceConfigInDataPlaneLocked(
   } else {
     filters.push_back(&DynamicTerminationFilter::kFilterVtable);
   }
-  RefCountedPtr<DynamicFilters> dynamic_filters =
-      DynamicFilters::Create(new_args, std::move(filters));
+  auto new_blackboard = MakeRefCounted<Blackboard>();
+  RefCountedPtr<DynamicFilters> dynamic_filters = DynamicFilters::Create(
+      new_args, std::move(filters), blackboard_.get(), new_blackboard.get());
   CHECK(dynamic_filters != nullptr);
+  blackboard_ = std::move(new_blackboard);
   // Grab data plane lock to update service config.
   //
   // We defer unreffing the old values (and deallocating memory) until
diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h
index 2741006a38a..0ca401df455 100644
--- a/src/core/client_channel/client_channel_filter.h
+++ b/src/core/client_channel/client_channel_filter.h
@@ -43,6 +43,7 @@
 #include "src/core/client_channel/dynamic_filters.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
+#include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
@@ -316,6 +317,8 @@ class ClientChannelFilter final {
       ABSL_GUARDED_BY(*work_serializer_);
   RefCountedPtr<ConfigSelector> saved_config_selector_
       ABSL_GUARDED_BY(*work_serializer_);
+  RefCountedPtr<const Blackboard> blackboard_
+      ABSL_GUARDED_BY(*work_serializer_);
   OrphanablePtr<LoadBalancingPolicy> lb_policy_
       ABSL_GUARDED_BY(*work_serializer_);
   RefCountedPtr<SubchannelPoolInterface> subchannel_pool_
diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc
index 45e7d4ffcbc..c2825925fa4 100644
--- a/src/core/client_channel/dynamic_filters.cc
+++ b/src/core/client_channel/dynamic_filters.cc
@@ -139,8 +139,10 @@ void DynamicFilters::Call::IncrementRefCount(const DebugLocation& /*location*/,
 namespace {
 
 absl::StatusOr<RefCountedPtr<grpc_channel_stack>> CreateChannelStack(
-    const ChannelArgs& args, std::vector<const grpc_channel_filter*> filters) {
+    const ChannelArgs& args, std::vector<const grpc_channel_filter*> filters,
+    const Blackboard* old_blackboard, Blackboard* new_blackboard) {
   ChannelStackBuilderImpl builder("DynamicFilters", GRPC_CLIENT_DYNAMIC, args);
+  builder.SetBlackboards(old_blackboard, new_blackboard);
   for (auto filter : filters) {
     builder.AppendFilter(filter);
   }
@@ -150,15 +152,17 @@ absl::StatusOr<RefCountedPtr<grpc_channel_stack>> CreateChannelStack(
 }  // namespace
 
 RefCountedPtr<DynamicFilters> DynamicFilters::Create(
-    const ChannelArgs& args, std::vector<const grpc_channel_filter*> filters) {
+    const ChannelArgs& args, std::vector<const grpc_channel_filter*> filters,
+    const Blackboard* old_blackboard, Blackboard* new_blackboard) {
   // Attempt to create channel stack from requested filters.
-  auto p = CreateChannelStack(args, std::move(filters));
+  auto p = CreateChannelStack(args, std::move(filters), old_blackboard,
+                              new_blackboard);
   if (!p.ok()) {
     // Channel stack creation failed with requested filters.
     // Create with lame filter instead.
     auto error = p.status();
     p = CreateChannelStack(args.Set(MakeLameClientErrorArg(&error)),
-                           {&LameClientFilter::kFilter});
+                           {&LameClientFilter::kFilter}, nullptr, nullptr);
   }
   return MakeRefCounted<DynamicFilters>(std::move(p.value()));
 }
diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h
index 142217d72d3..30a5354f935 100644
--- a/src/core/client_channel/dynamic_filters.h
+++ b/src/core/client_channel/dynamic_filters.h
@@ -24,6 +24,7 @@
 
 #include <grpc/slice.h>
 
+#include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
@@ -90,7 +91,8 @@ class DynamicFilters final : public RefCounted<DynamicFilters> {
   };
 
   static RefCountedPtr<DynamicFilters> Create(
-      const ChannelArgs& args, std::vector<const grpc_channel_filter*> filters);
+      const ChannelArgs& args, std::vector<const grpc_channel_filter*> filters,
+      const Blackboard* old_blackboard, Blackboard* new_blackboard);
 
   explicit DynamicFilters(RefCountedPtr<grpc_channel_stack> channel_stack)
       : channel_stack_(std::move(channel_stack)) {}
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
index c3a6ab3e71b..7e51b20dca3 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
@@ -37,6 +37,10 @@
 
 namespace grpc_core {
 
+//
+// GcpAuthenticationFilter::Call
+//
+
 const NoInterceptor GcpAuthenticationFilter::Call::OnClientToServerMessage;
 const NoInterceptor GcpAuthenticationFilter::Call::OnClientToServerHalfClose;
 const NoInterceptor GcpAuthenticationFilter::Call::OnServerInitialMetadata;
@@ -98,7 +102,7 @@ absl::Status GcpAuthenticationFilter::Call::OnClientInitialMetadata(
         cluster_name));
   }
   // Get the call creds instance.
-  auto creds = filter->GetCallCredentials(
+  auto creds = filter->cache_->Get(
       DownCast<const XdsGcpAuthnAudienceMetadataValue*>(metadata_value)->url());
   // Add the call creds instance to the call.
   auto* arena = GetContext<Arena>();
@@ -113,6 +117,34 @@ absl::Status GcpAuthenticationFilter::Call::OnClientInitialMetadata(
   return absl::OkStatus();
 }
 
+//
+// GcpAuthenticationFilter::CallCredentialsCache
+//
+
+UniqueTypeName GcpAuthenticationFilter::CallCredentialsCache::Type() {
+  static UniqueTypeName::Factory factory("gcp_auth_call_creds_cache");
+  return factory.Create();
+}
+
+void GcpAuthenticationFilter::CallCredentialsCache::SetMaxSize(
+    size_t max_size) {
+  MutexLock lock(&mu_);
+  cache_.SetMaxSize(max_size);
+}
+
+RefCountedPtr<grpc_call_credentials>
+GcpAuthenticationFilter::CallCredentialsCache::Get(
+    const std::string& audience) {
+  MutexLock lock(&mu_);
+  return cache_.GetOrInsert(audience, [](const std::string& audience) {
+    return MakeRefCounted<GcpServiceAccountIdentityCallCredentials>(audience);
+  });
+}
+
+//
+// GcpAuthenticationFilter
+//
+
 const grpc_channel_filter GcpAuthenticationFilter::kFilter =
     MakePromiseBasedFilter<GcpAuthenticationFilter, FilterEndpoint::kClient,
                            0>();
@@ -120,6 +152,7 @@ const grpc_channel_filter GcpAuthenticationFilter::kFilter =
 absl::StatusOr<std::unique_ptr<GcpAuthenticationFilter>>
 GcpAuthenticationFilter::Create(const ChannelArgs& args,
                                 ChannelFilter::Args filter_args) {
+  // Get filter config.
   auto* service_config = args.GetObject<ServiceConfig>();
   if (service_config == nullptr) {
     return absl::InvalidArgumentError(
@@ -136,29 +169,32 @@ GcpAuthenticationFilter::Create(const ChannelArgs& args,
     return absl::InvalidArgumentError(
         "gcp_auth: filter instance ID not found in filter config");
   }
+  // Get XdsConfig so that we can look up CDS resources.
   auto xds_config = args.GetObjectRef<XdsConfig>();
   if (xds_config == nullptr) {
     return absl::InvalidArgumentError(
         "gcp_auth: xds config not found in channel args");
   }
-  return std::make_unique<GcpAuthenticationFilter>(filter_config,
-                                                   std::move(xds_config));
+  // Get existing cache or create new one.
+  auto cache = filter_args.GetOrCreateState<CallCredentialsCache>(
+      filter_config->filter_instance_name, [&]() {
+        return MakeRefCounted<CallCredentialsCache>(filter_config->cache_size);
+      });
+  // Make sure size is updated, in case we're reusing a pre-existing
+  // cache but it has the wrong size.
+  cache->SetMaxSize(filter_config->cache_size);
+  // Instantiate filter.
+  return std::unique_ptr<GcpAuthenticationFilter>(new GcpAuthenticationFilter(
+      filter_config, std::move(xds_config), std::move(cache)));
 }
 
 GcpAuthenticationFilter::GcpAuthenticationFilter(
     const GcpAuthenticationParsedConfig::Config* filter_config,
-    RefCountedPtr<const XdsConfig> xds_config)
+    RefCountedPtr<const XdsConfig> xds_config,
+    RefCountedPtr<CallCredentialsCache> cache)
     : filter_config_(filter_config),
       xds_config_(std::move(xds_config)),
-      cache_(filter_config->cache_size) {}
-
-RefCountedPtr<grpc_call_credentials>
-GcpAuthenticationFilter::GetCallCredentials(const std::string& audience) {
-  MutexLock lock(&mu_);
-  return cache_.GetOrInsert(audience, [](const std::string& audience) {
-    return MakeRefCounted<GcpServiceAccountIdentityCallCredentials>(audience);
-  });
-}
+      cache_(std::move(cache)) {}
 
 void GcpAuthenticationFilterRegister(CoreConfiguration::Builder* builder) {
   GcpAuthenticationServiceConfigParser::Register(builder);
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
index 18109c70c1b..f8fc704c9e8 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
@@ -25,6 +25,7 @@
 #include "absl/strings/string_view.h"
 
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
+#include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
@@ -49,10 +50,6 @@ class GcpAuthenticationFilter
   static absl::StatusOr<std::unique_ptr<GcpAuthenticationFilter>> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-  GcpAuthenticationFilter(
-      const GcpAuthenticationParsedConfig::Config* filter_config,
-      RefCountedPtr<const XdsConfig> xds_config);
-
   class Call {
    public:
     absl::Status OnClientInitialMetadata(ClientMetadata& /*md*/,
@@ -66,15 +63,30 @@ class GcpAuthenticationFilter
   };
 
  private:
-  RefCountedPtr<grpc_call_credentials> GetCallCredentials(
-      const std::string& audience);
+  class CallCredentialsCache : public Blackboard::Entry {
+   public:
+    explicit CallCredentialsCache(size_t max_size) : cache_(max_size) {}
+
+    static UniqueTypeName Type();
+
+    void SetMaxSize(size_t max_size);
+
+    RefCountedPtr<grpc_call_credentials> Get(const std::string& audience);
+
+   private:
+    Mutex mu_;
+    LruCache<std::string /*audience*/, RefCountedPtr<grpc_call_credentials>>
+        cache_ ABSL_GUARDED_BY(&mu_);
+  };
+
+  GcpAuthenticationFilter(
+      const GcpAuthenticationParsedConfig::Config* filter_config,
+      RefCountedPtr<const XdsConfig> xds_config,
+      RefCountedPtr<CallCredentialsCache> cache);
 
   const GcpAuthenticationParsedConfig::Config* filter_config_;
   const RefCountedPtr<const XdsConfig> xds_config_;
-
-  Mutex mu_;
-  LruCache<std::string /*audience*/, RefCountedPtr<grpc_call_credentials>>
-      cache_ ABSL_GUARDED_BY(&mu_);
+  const RefCountedPtr<CallCredentialsCache> cache_;
 };
 
 }  // namespace grpc_core
diff --git a/src/core/filter/blackboard.cc b/src/core/filter/blackboard.cc
new file mode 100644
index 00000000000..b916bf77d8f
--- /dev/null
+++ b/src/core/filter/blackboard.cc
@@ -0,0 +1,33 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "src/core/filter/blackboard.h"
+
+namespace grpc_core {
+
+RefCountedPtr<Blackboard::Entry> Blackboard::Get(UniqueTypeName type,
+                                                 const std::string& key) const {
+  auto it = map_.find(std::make_pair(type, key));
+  if (it == map_.end()) return nullptr;
+  return it->second;
+}
+
+void Blackboard::Set(UniqueTypeName type, const std::string& key,
+                     RefCountedPtr<Entry> entry) {
+  map_[std::make_pair(type, key)] = std::move(entry);
+}
+
+}  // namespace grpc_core
diff --git a/src/core/filter/blackboard.h b/src/core/filter/blackboard.h
new file mode 100644
index 00000000000..972758162f0
--- /dev/null
+++ b/src/core/filter/blackboard.h
@@ -0,0 +1,71 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_SRC_CORE_FILTER_BLACKBOARD_H
+#define GRPC_SRC_CORE_FILTER_BLACKBOARD_H
+
+#include <string>
+#include <utility>
+
+#include "absl/container/flat_hash_map.h"
+#include "absl/strings/string_view.h"
+
+#include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/util/debug_location.h"
+#include "src/core/util/ref_counted.h"
+#include "src/core/util/ref_counted_ptr.h"
+#include "src/core/util/unique_type_name.h"
+#include "src/core/util/useful.h"
+
+namespace grpc_core {
+
+// A blackboard is a place where dynamic filters can stash global state
+// that they may want to retain across resolver updates.  Entries are
+// identified by by the unique type and a name that identifies the instance,
+// which means that it's possible for two filter instances to use the same
+// type (e.g., if there are two instantiations of the same filter).
+class Blackboard : public RefCounted<Blackboard> {
+ public:
+  // All entries must derive from this type.
+  // They must also have a static method with the following signature:
+  //  static UniqueTypeName Type();
+  class Entry : public RefCounted<Entry> {};
+
+  // Returns an entry for a particular type and name, or null if not present.
+  template <typename T>
+  RefCountedPtr<T> Get(const std::string& key) const {
+    return Get(T::Type(), key).template TakeAsSubclass<T>();
+  }
+
+  // Sets an entry for a particular type and name.
+  template <typename T>
+  void Set(const std::string& key, RefCountedPtr<T> entry) {
+    Set(T::Type(), key, std::move(entry));
+  }
+
+ private:
+  RefCountedPtr<Entry> Get(UniqueTypeName type, const std::string& key) const;
+  void Set(UniqueTypeName type, const std::string& key,
+           RefCountedPtr<Entry> entry);
+
+  absl::flat_hash_map<std::pair<UniqueTypeName, std::string>,
+                      RefCountedPtr<Entry>>
+      map_;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_FILTER_BLACKBOARD_H
diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc
index 2590ab4590d..14e618a7fd8 100644
--- a/src/core/lib/channel/channel_stack.cc
+++ b/src/core/lib/channel/channel_stack.cc
@@ -116,7 +116,8 @@ grpc_error_handle grpc_channel_stack_init(
     int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg,
     const grpc_channel_filter** filters, size_t filter_count,
     const grpc_core::ChannelArgs& channel_args, const char* name,
-    grpc_channel_stack* stack) {
+    grpc_channel_stack* stack, const grpc_core::Blackboard* old_blackboard,
+    grpc_core::Blackboard* new_blackboard) {
   if (GRPC_TRACE_FLAG_ENABLED(channel_stack)) {
     LOG(INFO) << "CHANNEL_STACK: init " << name;
     for (size_t i = 0; i < filter_count; i++) {
@@ -145,6 +146,8 @@ grpc_error_handle grpc_channel_stack_init(
                                              sizeof(grpc_channel_element));
 
   // init per-filter data
+  args.old_blackboard = old_blackboard;
+  args.new_blackboard = new_blackboard;
   grpc_error_handle first_error;
   for (i = 0; i < filter_count; i++) {
     args.channel_stack = stack;
diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h
index 8ed7b4eafe1..56bcb62f900 100644
--- a/src/core/lib/channel/channel_stack.h
+++ b/src/core/lib/channel/channel_stack.h
@@ -19,13 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_H
 
-//////////////////////////////////////////////////////////////////////////////
-// IMPORTANT NOTE:
-//
-// When you update this API, please make the corresponding changes to
-// the C++ API in src/cpp/common/channel_filter.{h,cc}
-//////////////////////////////////////////////////////////////////////////////
-
 // A channel filter defines how operations on a channel are implemented.
 // Channel filters are chained together to create full channels, and if those
 // chains are linear, then channel stacks provide a mechanism to minimize
@@ -74,11 +67,17 @@
 #include "src/core/util/time_precise.h"
 #include "src/core/util/unique_type_name.h"
 
+namespace grpc_core {
+class Blackboard;
+}  // namespace grpc_core
+
 struct grpc_channel_element_args {
   grpc_channel_stack* channel_stack;
   grpc_core::ChannelArgs channel_args;
   int is_first;
   int is_last;
+  const grpc_core::Blackboard* old_blackboard;
+  grpc_core::Blackboard* new_blackboard;
 };
 struct grpc_call_element_args {
   grpc_call_stack* call_stack;
@@ -262,7 +261,9 @@ grpc_error_handle grpc_channel_stack_init(
     int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg,
     const grpc_channel_filter** filters, size_t filter_count,
     const grpc_core::ChannelArgs& args, const char* name,
-    grpc_channel_stack* stack);
+    grpc_channel_stack* stack,
+    const grpc_core::Blackboard* old_blackboard = nullptr,
+    grpc_core::Blackboard* new_blackboard = nullptr);
 // Destroy a channel stack
 void grpc_channel_stack_destroy(grpc_channel_stack* stack);
 
diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc
index 953a60a9232..360cd7aa7db 100644
--- a/src/core/lib/channel/channel_stack_builder_impl.cc
+++ b/src/core/lib/channel/channel_stack_builder_impl.cc
@@ -77,7 +77,7 @@ ChannelStackBuilderImpl::Build() {
         gpr_free(stk);
       },
       channel_stack, stack.data(), stack.size(), channel_args(), name(),
-      channel_stack);
+      channel_stack, old_blackboard_, new_blackboard_);
 
   if (!error.ok()) {
     grpc_channel_stack_destroy(channel_stack);
diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h
index 3bce0f5db3f..78df9809c90 100644
--- a/src/core/lib/channel/channel_stack_builder_impl.h
+++ b/src/core/lib/channel/channel_stack_builder_impl.h
@@ -25,6 +25,8 @@
 
 namespace grpc_core {
 
+class Blackboard;
+
 // Build a channel stack.
 // Allows interested parties to add filters to the stack, and to query an
 // in-progress build.
@@ -34,13 +36,24 @@ class ChannelStackBuilderImpl final : public ChannelStackBuilder {
  public:
   using ChannelStackBuilder::ChannelStackBuilder;
 
+  void SetBlackboards(const Blackboard* old_blackboard,
+                      Blackboard* new_blackboard) {
+    old_blackboard_ = old_blackboard;
+    new_blackboard_ = new_blackboard;
+  }
+
   // Build the channel stack.
   // After success, *result holds the new channel stack,
   // prefix_bytes are allocated before the channel stack,
   // initial_refs, destroy, destroy_arg are as per grpc_channel_stack_init
   // On failure, *result is nullptr.
   absl::StatusOr<RefCountedPtr<grpc_channel_stack>> Build() override;
+
+ private:
+  const Blackboard* old_blackboard_ = nullptr;
+  Blackboard* new_blackboard_ = nullptr;
 };
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 0ac59932e0f..6b2ba31ce6b 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -42,6 +42,7 @@
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
@@ -81,15 +82,23 @@ class ChannelFilter {
    public:
     Args() : Args(nullptr, nullptr) {}
     Args(grpc_channel_stack* channel_stack,
-         grpc_channel_element* channel_element)
-        : impl_(ChannelStackBased{channel_stack, channel_element}) {}
+         grpc_channel_element* channel_element,
+         const Blackboard* old_blackboard = nullptr,
+         Blackboard* new_blackboard = nullptr)
+        : impl_(ChannelStackBased{channel_stack, channel_element}),
+          old_blackboard_(old_blackboard),
+          new_blackboard_(new_blackboard) {}
     // While we're moving to call-v3 we need to have access to
     // grpc_channel_stack & friends here. That means that we can't rely on this
     // type signature from interception_chain.h, which means that we need a way
     // of constructing this object without naming it ===> implicit construction.
     // TODO(ctiller): remove this once we're fully on call-v3
     // NOLINTNEXTLINE(google-explicit-constructor)
-    Args(size_t instance_id) : impl_(V3Based{instance_id}) {}
+    Args(size_t instance_id, const Blackboard* old_blackboard = nullptr,
+         Blackboard* new_blackboard = nullptr)
+        : impl_(V3Based{instance_id}),
+          old_blackboard_(old_blackboard),
+          new_blackboard_(new_blackboard) {}
 
     ABSL_DEPRECATED("Direct access to channel stack is deprecated")
     grpc_channel_stack* channel_stack() const {
@@ -113,6 +122,21 @@ class ChannelFilter {
           [](const V3Based& v3) { return v3.instance_id; });
     }
 
+    // If a filter state object of type T exists for key from a previous
+    // filter stack, retains it for the new filter stack we're constructing.
+    // Otherwise, invokes create_func() to create a new filter state
+    // object for the new filter stack.  Returns the new filter state object.
+    template <typename T>
+    RefCountedPtr<T> GetOrCreateState(
+        const std::string& key,
+        absl::FunctionRef<RefCountedPtr<T>()> create_func) {
+      RefCountedPtr<T> state;
+      if (old_blackboard_ != nullptr) state = old_blackboard_->Get<T>(key);
+      if (state == nullptr) state = create_func();
+      if (new_blackboard_ != nullptr) new_blackboard_->Set(key, state);
+      return state;
+    }
+
    private:
     friend class ChannelFilter;
 
@@ -127,6 +151,9 @@ class ChannelFilter {
 
     using Impl = absl::variant<ChannelStackBased, V3Based>;
     Impl impl_;
+
+    const Blackboard* old_blackboard_ = nullptr;
+    Blackboard* new_blackboard_ = nullptr;
   };
 
   // Perform post-initialization step (if any).
@@ -1620,8 +1647,10 @@ struct ChannelFilterWithFlagsMethods {
   static absl::Status InitChannelElem(grpc_channel_element* elem,
                                       grpc_channel_element_args* args) {
     CHECK(args->is_last == ((kFlags & kFilterIsLast) != 0));
-    auto status = F::Create(args->channel_args,
-                            ChannelFilter::Args(args->channel_stack, elem));
+    auto status = F::Create(
+        args->channel_args,
+        ChannelFilter::Args(args->channel_stack, elem, args->old_blackboard,
+                            args->new_blackboard));
     if (!status.ok()) {
       new (elem->channel_data) F*(nullptr);
       return absl_status_to_grpc_error(status.status());
diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h
index 82608e3a005..a204985afc0 100644
--- a/src/core/lib/transport/interception_chain.h
+++ b/src/core/lib/transport/interception_chain.h
@@ -28,6 +28,7 @@
 
 namespace grpc_core {
 
+class Blackboard;
 class InterceptionChainBuilder;
 
 // One hijacked call. Using this we can get access to the CallHandler for the
@@ -153,8 +154,12 @@ class InterceptionChainBuilder final {
       absl::variant<RefCountedPtr<UnstartedCallDestination>,
                     RefCountedPtr<CallDestination>>;
 
-  explicit InterceptionChainBuilder(ChannelArgs args)
-      : args_(std::move(args)) {}
+  explicit InterceptionChainBuilder(ChannelArgs args,
+                                    const Blackboard* old_blackboard = nullptr,
+                                    Blackboard* new_blackboard = nullptr)
+      : args_(std::move(args)),
+        old_blackboard_(old_blackboard),
+        new_blackboard_(new_blackboard) {}
 
   // Add a filter with a `Call` class as an inner member.
   // Call class must be one compatible with the filters described in
@@ -163,7 +168,8 @@ class InterceptionChainBuilder final {
   absl::enable_if_t<sizeof(typename T::Call) != 0, InterceptionChainBuilder&>
   Add() {
     if (!status_.ok()) return *this;
-    auto filter = T::Create(args_, {FilterInstanceId(FilterTypeId<T>())});
+    auto filter = T::Create(args_, {FilterInstanceId(FilterTypeId<T>()),
+                                    old_blackboard_, new_blackboard_});
     if (!filter.ok()) {
       status_ = filter.status();
       return *this;
@@ -179,7 +185,8 @@ class InterceptionChainBuilder final {
   absl::enable_if_t<std::is_base_of<Interceptor, T>::value,
                     InterceptionChainBuilder&>
   Add() {
-    AddInterceptor(T::Create(args_, {FilterInstanceId(FilterTypeId<T>())}));
+    AddInterceptor(T::Create(args_, {FilterInstanceId(FilterTypeId<T>()),
+                                     old_blackboard_, new_blackboard_}));
     return *this;
   };
 
@@ -237,6 +244,8 @@ class InterceptionChainBuilder final {
   absl::Status status_;
   std::map<size_t, size_t> filter_type_counts_;
   static std::atomic<size_t> next_filter_id_;
+  const Blackboard* old_blackboard_ = nullptr;
+  Blackboard* new_blackboard_ = nullptr;
 };
 
 }  // namespace grpc_core
diff --git a/src/core/util/lru_cache.h b/src/core/util/lru_cache.h
index d0bf5934f4b..6c9f045af7c 100644
--- a/src/core/util/lru_cache.h
+++ b/src/core/util/lru_cache.h
@@ -47,6 +47,11 @@ class LruCache {
   // to be too large, removes the least recently used entry.
   Value GetOrInsert(Key key, absl::AnyInvocable<Value(const Key&)> create);
 
+  // Changes the max size of the cache.  If there are currently more than
+  // max_size entries, deletes least-recently-used entries to enforce
+  // the new max size.
+  void SetMaxSize(size_t max_size);
+
  private:
   struct CacheEntry {
     Value value;
@@ -55,7 +60,9 @@ class LruCache {
     explicit CacheEntry(Value v) : value(std::move(v)) {}
   };
 
-  const size_t max_size_;
+  void RemoveOldestEntry();
+
+  size_t max_size_;
   absl::flat_hash_map<Key, CacheEntry> cache_;
   std::list<Key> lru_list_;
 };
@@ -82,14 +89,7 @@ Value LruCache<Key, Value>::GetOrInsert(
   if (value.has_value()) return std::move(*value);
   // Entry not found.  We'll need to insert a new entry.
   // If the cache is at max size, remove the least recently used entry.
-  if (cache_.size() == max_size_) {
-    auto lru_it = lru_list_.begin();
-    CHECK(lru_it != lru_list_.end());
-    auto cache_it = cache_.find(*lru_it);
-    CHECK(cache_it != cache_.end());
-    cache_.erase(cache_it);
-    lru_list_.pop_front();
-  }
+  if (cache_.size() == max_size_) RemoveOldestEntry();
   // Create a new entry, insert it, and return it.
   auto it = cache_
                 .emplace(std::piecewise_construct, std::forward_as_tuple(key),
@@ -99,6 +99,24 @@ Value LruCache<Key, Value>::GetOrInsert(
   return it->second.value;
 }
 
+template <typename Key, typename Value>
+void LruCache<Key, Value>::SetMaxSize(size_t max_size) {
+  max_size_ = max_size;
+  while (cache_.size() > max_size_) {
+    RemoveOldestEntry();
+  }
+}
+
+template <typename Key, typename Value>
+void LruCache<Key, Value>::RemoveOldestEntry() {
+  auto lru_it = lru_list_.begin();
+  CHECK(lru_it != lru_list_.end());
+  auto cache_it = cache_.find(*lru_it);
+  CHECK(cache_it != cache_.end());
+  cache_.erase(cache_it);
+  lru_list_.pop_front();
+}
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_UTIL_LRU_CACHE_H
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index c7e8f2b4c9f..7c9601a6fe8 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -406,6 +406,7 @@ CORE_SOURCE_FILES = [
     'src/core/ext/upbdefs-gen/xds/type/v3/cel.upbdefs.c',
     'src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c',
     'src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c',
+    'src/core/filter/blackboard.cc',
     'src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc',
     'src/core/handshaker/handshaker.cc',
     'src/core/handshaker/handshaker_registry.cc',
diff --git a/test/core/filters/BUILD b/test/core/filters/BUILD
index c14d98de853..1674eefb08a 100644
--- a/test/core/filters/BUILD
+++ b/test/core/filters/BUILD
@@ -150,3 +150,16 @@ grpc_cc_benchmark(
         "//test/core/transport:call_spine_benchmarks",
     ],
 )
+
+grpc_cc_test(
+    name = "blackboard_test",
+    srcs = ["blackboard_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//src/core:blackboard",
+    ],
+)
diff --git a/test/core/filters/blackboard_test.cc b/test/core/filters/blackboard_test.cc
new file mode 100644
index 00000000000..863aa3fbb36
--- /dev/null
+++ b/test/core/filters/blackboard_test.cc
@@ -0,0 +1,66 @@
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "src/core/filter/blackboard.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+namespace grpc_core {
+namespace {
+
+class FooEntry : public Blackboard::Entry {
+ public:
+  static UniqueTypeName Type() {
+    static UniqueTypeName::Factory kFactory("FooEntry");
+    return kFactory.Create();
+  }
+};
+
+class BarEntry : public Blackboard::Entry {
+ public:
+  static UniqueTypeName Type() {
+    static UniqueTypeName::Factory kFactory("BarEntry");
+    return kFactory.Create();
+  }
+};
+
+TEST(Blackboard, Basic) {
+  Blackboard blackboard;
+  // No entry for type FooEntry key "foo".
+  EXPECT_EQ(blackboard.Get<FooEntry>("a"), nullptr);
+  // Set entry for type FooEntry key "foo".
+  auto foo_entry = MakeRefCounted<FooEntry>();
+  blackboard.Set("a", foo_entry);
+  // Get the entry we just added.
+  EXPECT_EQ(blackboard.Get<FooEntry>("a"), foo_entry);
+  // A different key for the same type is still unset.
+  EXPECT_EQ(blackboard.Get<FooEntry>("b"), nullptr);
+  // The same key for a different type is still unset.
+  EXPECT_EQ(blackboard.Get<BarEntry>("a"), nullptr);
+  // Set entry for type BarEntry key "foo".
+  auto bar_entry = MakeRefCounted<BarEntry>();
+  blackboard.Set("a", bar_entry);
+  EXPECT_EQ(blackboard.Get<BarEntry>("a"), bar_entry);
+  // This should not have replaced the same key for FooEntry.
+  EXPECT_EQ(blackboard.Get<FooEntry>("a"), foo_entry);
+}
+
+}  // namespace
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/test/core/util/lru_cache_test.cc b/test/core/util/lru_cache_test.cc
index fbb9ce1f37f..63745e073ce 100644
--- a/test/core/util/lru_cache_test.cc
+++ b/test/core/util/lru_cache_test.cc
@@ -66,6 +66,39 @@ TEST(LruCache, Basic) {
   EXPECT_THAT(created_list, ::testing::ElementsAreArray(kOrder2));
 }
 
+TEST(LruCache, SetMaxSize) {
+  auto create = [&](const std::string& key) {
+    int value;
+    CHECK(absl::SimpleAtoi(key, &value));
+    return value;
+  };
+  // Create a cache with max size 10.
+  LruCache<std::string, int> cache(10);
+  // Insert 10 values.
+  for (int i = 1; i <= 10; ++i) {
+    std::string key = absl::StrCat(i);
+    EXPECT_EQ(absl::nullopt, cache.Get(key));
+    EXPECT_EQ(i, cache.GetOrInsert(key, create));
+    EXPECT_EQ(i, cache.Get(key));
+  }
+  // Set max size to 15.  All elements should still be present.
+  cache.SetMaxSize(15);
+  for (int i = 1; i <= 10; ++i) {
+    std::string key = absl::StrCat(i);
+    EXPECT_EQ(i, cache.Get(key));
+  }
+  // Set max size to 6.  This should remove the first 4 elements.
+  cache.SetMaxSize(6);
+  for (int i = 1; i <= 4; ++i) {
+    std::string key = absl::StrCat(i);
+    EXPECT_EQ(absl::nullopt, cache.Get(key)) << i;
+  }
+  for (int i = 5; i <= 10; ++i) {
+    std::string key = absl::StrCat(i);
+    EXPECT_EQ(i, cache.Get(key));
+  }
+}
+
 }  // namespace grpc_core
 
 int main(int argc, char** argv) {
diff --git a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
index d30c22e7605..775eb60e6fc 100644
--- a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
@@ -50,6 +50,7 @@ class XdsGcpAuthnEnd2endTest : public XdsEnd2endTest {
   void SetUp() override {
     g_audience = "";
     g_token = nullptr;
+    g_num_token_fetches = 0;
     grpc_core::HttpRequest::SetOverride(HttpGetOverride, nullptr, nullptr);
     InitClient(MakeBootstrapBuilder(), /*lb_expected_authority=*/"",
                /*xds_resource_does_not_exist_timeout_ms=*/0,
@@ -83,6 +84,7 @@ class XdsGcpAuthnEnd2endTest : public XdsEnd2endTest {
             "/computeMetadata/v1/instance/service-accounts/default/identity") {
       return 0;
     }
+    g_num_token_fetches.fetch_add(1);
     // Validate request.
     ValidateHttpRequest(request, uri);
     // Generate response.
@@ -126,10 +128,12 @@ class XdsGcpAuthnEnd2endTest : public XdsEnd2endTest {
 
   static absl::string_view g_audience;
   static const char* g_token;
+  static std::atomic<size_t> g_num_token_fetches;
 };
 
 absl::string_view XdsGcpAuthnEnd2endTest::g_audience;
 const char* XdsGcpAuthnEnd2endTest::g_token;
+std::atomic<size_t> XdsGcpAuthnEnd2endTest::g_num_token_fetches;
 
 INSTANTIATE_TEST_SUITE_P(XdsTest, XdsGcpAuthnEnd2endTest,
                          ::testing::Values(XdsTestType()), &XdsTestType::Name);
@@ -159,6 +163,7 @@ TEST_P(XdsGcpAuthnEnd2endTest, Basic) {
   EXPECT_THAT(server_initial_metadata,
               ::testing::Contains(::testing::Pair(
                   "authorization", absl::StrCat("Bearer ", g_token))));
+  EXPECT_EQ(g_num_token_fetches.load(), 1);
 }
 
 TEST_P(XdsGcpAuthnEnd2endTest, NoOpWhenClusterHasNoAudience) {
@@ -183,6 +188,70 @@ TEST_P(XdsGcpAuthnEnd2endTest, NoOpWhenClusterHasNoAudience) {
       ::testing::Not(::testing::Contains(::testing::Key("authorization"))));
 }
 
+TEST_P(XdsGcpAuthnEnd2endTest, CacheRetainedAcrossXdsUpdates) {
+  grpc_core::testing::ScopedExperimentalEnvVar env(
+      "GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER");
+  // Construct auth token.
+  g_audience = kAudience;
+  std::string token = MakeToken(grpc_core::Timestamp::InfFuture());
+  g_token = token.c_str();
+  // Set xDS resources.
+  CreateAndStartBackends(1, /*xds_enabled=*/false,
+                         CreateTlsServerCredentials());
+  SetListenerAndRouteConfiguration(balancer_.get(),
+                                   BuildListenerWithGcpAuthnFilter(),
+                                   default_route_config_);
+  balancer_->ads_service()->SetCdsResource(BuildClusterWithAudience(kAudience));
+  EdsResourceArgs args({{"locality0", {CreateEndpoint(0)}}});
+  balancer_->ads_service()->SetEdsResource(BuildEdsResource(args));
+  // Send an RPC and check that it arrives with the right auth token.
+  std::multimap<std::string, std::string> server_initial_metadata;
+  Status status = SendRpc(RpcOptions().set_echo_metadata_initially(true),
+                          /*response=*/nullptr, &server_initial_metadata);
+  EXPECT_TRUE(status.ok()) << "code=" << status.error_code()
+                           << " message=" << status.error_message();
+  EXPECT_THAT(server_initial_metadata,
+              ::testing::Contains(::testing::Pair(
+                  "authorization", absl::StrCat("Bearer ", g_token))));
+  EXPECT_EQ(g_num_token_fetches.load(), 1);
+  // Trigger update that changes the route config, thus causing the
+  // dynamic filters to be recreated.
+  // We insert a route that matches requests with the header "foo" and
+  // has a non-forwarding action, which will cause the client to fail RPCs
+  // that hit this route.
+  RouteConfiguration route_config = default_route_config_;
+  *route_config.mutable_virtual_hosts(0)->add_routes() =
+      route_config.virtual_hosts(0).routes(0);
+  auto* header_matcher = route_config.mutable_virtual_hosts(0)
+                             ->mutable_routes(0)
+                             ->mutable_match()
+                             ->add_headers();
+  header_matcher->set_name("foo");
+  header_matcher->set_present_match(true);
+  route_config.mutable_virtual_hosts(0)
+      ->mutable_routes(0)
+      ->mutable_non_forwarding_action();
+  SetListenerAndRouteConfiguration(
+      balancer_.get(), BuildListenerWithGcpAuthnFilter(), route_config);
+  // Send RPCs with the header "foo" and wait for them to start failing.
+  // When they do, we know that the client has seen the update.
+  SendRpcsUntil(
+      DEBUG_LOCATION,
+      [&](const RpcResult& result) {
+        if (result.status.ok()) return true;
+        EXPECT_EQ(StatusCode::UNAVAILABLE, result.status.error_code());
+        EXPECT_EQ("Matching route has inappropriate action",
+                  result.status.error_message());
+        return false;
+      },
+      /*timeout_ms=*/15000, RpcOptions().set_metadata({{"foo", "bar"}}));
+  // Now send an RPC without the header, which will go through the new
+  // instance of the GCP auth filter.
+  CheckRpcSendOk(DEBUG_LOCATION);
+  // Make sure we didn't re-fetch the token.
+  EXPECT_EQ(g_num_token_fetches.load(), 1);
+}
+
 TEST_P(XdsGcpAuthnEnd2endTest, FilterIgnoredWhenEnvVarNotSet) {
   // Construct auth token.
   g_audience = kAudience;
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 4220bb664a0..efef382f359 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -2081,6 +2081,8 @@ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
 src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h \
 src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
 src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h \
+src/core/filter/blackboard.cc \
+src/core/filter/blackboard.h \
 src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
 src/core/handshaker/endpoint_info/endpoint_info_handshaker.h \
 src/core/handshaker/handshaker.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index eae9a2e2ea4..0471de0c886 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1848,6 +1848,8 @@ src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.c \
 src/core/ext/upbdefs-gen/xds/type/v3/range.upbdefs.h \
 src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.c \
 src/core/ext/upbdefs-gen/xds/type/v3/typed_struct.upbdefs.h \
+src/core/filter/blackboard.cc \
+src/core/filter/blackboard.h \
 src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc \
 src/core/handshaker/endpoint_info/endpoint_info_handshaker.h \
 src/core/handshaker/handshaker.cc \
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 98ffb7f4c19..991313c58b5 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -1161,6 +1161,30 @@
     ],
     "uses_polling": false
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "blackboard_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,

From f1df0f2b5f4d4b6073a81fe697fbeb986d4a3b6d Mon Sep 17 00:00:00 2001
From: Yousuk Seung <ysseung@google.com>
Date: Fri, 27 Sep 2024 13:29:31 -0700
Subject: [PATCH 10/74] [doc] Clarify client callback API comments (#37805)

Comments say users "should not" call Start* methods after notification callbacks are called with false, but users may still call so it's close to 'not recommended'. But it's less confusing to remove it altogether.

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37805

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37805 from yousukseung:client_callback_doc_clarify 38b9371f79d9763a84bbfb6972c21d23b4f36613
PiperOrigin-RevId: 679709417
---
 include/grpcpp/support/client_callback.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/grpcpp/support/client_callback.h b/include/grpcpp/support/client_callback.h
index 692dff6b8d1..82a404e2c87 100644
--- a/include/grpcpp/support/client_callback.h
+++ b/include/grpcpp/support/client_callback.h
@@ -325,21 +325,20 @@ class ClientBidiReactor : public internal::ClientReactor {
   /// call of OnReadDone or OnDone.
   ///
   /// \param[in] ok Was the initial metadata read successfully? If false, no
-  ///               new read/write operation will succeed, and any further
-  ///               Start* operations should not be called.
+  ///               new read/write operation will succeed.
   virtual void OnReadInitialMetadataDone(bool /*ok*/) {}
 
   /// Notifies the application that a StartRead operation completed.
   ///
   /// \param[in] ok Was it successful? If false, no new read/write operation
-  ///               will succeed, and any further Start* should not be called.
+  ///               will succeed.
   virtual void OnReadDone(bool /*ok*/) {}
 
   /// Notifies the application that a StartWrite or StartWriteLast operation
   /// completed.
   ///
   /// \param[in] ok Was it successful? If false, no new read/write operation
-  ///               will succeed, and any further Start* should not be called.
+  ///               will succeed.
   virtual void OnWriteDone(bool /*ok*/) {}
 
   /// Notifies the application that a StartWritesDone operation completed. Note

From 1b11b9218252e23f4e7fe8fdadae29c6abd86596 Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Fri, 27 Sep 2024 14:54:52 -0700
Subject: [PATCH 11/74] [Deps] Updated Abseil to 1.20240722.0 (#37543)

Closes #37543

PiperOrigin-RevId: 679738302
---
 CMakeLists.txt                                |   6 +
 Makefile                                      |   3 +
 bazel/grpc_deps.bzl                           |   8 +-
 config.m4                                     |   3 +
 config.w32                                    |   3 +
 gRPC-C++.podspec                              |   2 +-
 gRPC-Core.podspec                             |   2 +-
 grpc.gemspec                                  |  10 +-
 package.xml                                   |  10 +-
 src/abseil-cpp/preprocessed_builds.yaml       | 107 ++++++++++++++++--
 src/python/grpcio/grpc_core_dependencies.py   |   3 +
 .../observability_lib_deps.py                 |   3 +
 templates/gRPC-C++.podspec.template           |   2 +-
 templates/gRPC-Core.podspec.template          |   2 +-
 third_party/abseil-cpp                        |   2 +-
 .../python/grpcio_tools/protoc_lib_deps.py    |   3 +
 tools/run_tests/sanity/check_submodules.sh    |   2 +-
 17 files changed, 148 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec604861f22..da1e9c4ae87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,6 +110,7 @@ set(gRPC_ABSL_USED_TARGETS
   absl_base_internal
   absl_bind_front
   absl_bits
+  absl_bounded_utf8_length_sequence
   absl_charset
   absl_check
   absl_city
@@ -117,6 +118,7 @@ set(gRPC_ABSL_USED_TARGETS
   absl_cleanup
   absl_cleanup_internal
   absl_common_policy_traits
+  absl_compare
   absl_compressed_tuple
   absl_config
   absl_container_common
@@ -135,7 +137,9 @@ set(gRPC_ABSL_USED_TARGETS
   absl_crc_cpu_detect
   absl_crc_internal
   absl_debugging_internal
+  absl_decode_rust_punycode
   absl_demangle_internal
+  absl_demangle_rust
   absl_dynamic_annotations
   absl_endian
   absl_errno_saver
@@ -159,6 +163,7 @@ set(gRPC_ABSL_USED_TARGETS
   absl_graphcycles_internal
   absl_has_ostream_operator
   absl_hash
+  absl_hash_container_defaults
   absl_hash_function_defaults
   absl_hash_policy_traits
   absl_hashtable_debug_hooks
@@ -245,6 +250,7 @@ set(gRPC_ABSL_USED_TARGETS
   absl_time
   absl_time_zone
   absl_type_traits
+  absl_utf8_for_code_point
   absl_utility
   absl_variant
   absl_vlog_config_internal
diff --git a/Makefile b/Makefile
index 078484c1fd6..028c9f90090 100644
--- a/Makefile
+++ b/Makefile
@@ -1544,9 +1544,12 @@ LIBGRPC_SRC = \
     third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc \
     third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc \
     third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \
+    third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc \
     third_party/abseil-cpp/absl/debugging/internal/demangle.cc \
+    third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc \
     third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \
     third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \
+    third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc \
     third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \
     third_party/abseil-cpp/absl/debugging/stacktrace.cc \
     third_party/abseil-cpp/absl/debugging/symbolize.cc \
diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
index 138ef9ed8af..b3d416aae9d 100644
--- a/bazel/grpc_deps.bzl
+++ b/bazel/grpc_deps.bzl
@@ -143,11 +143,11 @@ def grpc_deps():
     if "com_google_absl" not in native.existing_rules():
         http_archive(
             name = "com_google_absl",
-            sha256 = "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440",
-            strip_prefix = "abseil-cpp-20240116.0",
+            sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3",
+            strip_prefix = "abseil-cpp-20240722.0",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz",
-                "https://github.com/abseil/abseil-cpp/archive/20240116.0.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz",
+                "https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz",
             ],
         )
 
diff --git a/config.m4 b/config.m4
index ae67f344840..9bc1a068f3f 100644
--- a/config.m4
+++ b/config.m4
@@ -929,9 +929,12 @@ if test "$PHP_GRPC" != "no"; then
     third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc \
     third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc \
     third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc \
+    third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc \
     third_party/abseil-cpp/absl/debugging/internal/demangle.cc \
+    third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc \
     third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc \
     third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc \
+    third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc \
     third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc \
     third_party/abseil-cpp/absl/debugging/stacktrace.cc \
     third_party/abseil-cpp/absl/debugging/symbolize.cc \
diff --git a/config.w32 b/config.w32
index 94e02c3e172..f1f0df73b81 100644
--- a/config.w32
+++ b/config.w32
@@ -894,9 +894,12 @@ if (PHP_GRPC != "no") {
     "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_non_temporal_memcpy.cc " +
     "third_party\\abseil-cpp\\absl\\crc\\internal\\crc_x86_arm_combined.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\internal\\address_is_readable.cc " +
+    "third_party\\abseil-cpp\\absl\\debugging\\internal\\decode_rust_punycode.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\internal\\demangle.cc " +
+    "third_party\\abseil-cpp\\absl\\debugging\\internal\\demangle_rust.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\internal\\elf_mem_image.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\internal\\examine_stack.cc " +
+    "third_party\\abseil-cpp\\absl\\debugging\\internal\\utf8_for_code_point.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\internal\\vdso_support.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\stacktrace.cc " +
     "third_party\\abseil-cpp\\absl\\debugging\\symbolize.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index a63753dd7d1..abca293e113 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -231,7 +231,7 @@ Pod::Spec.new do |s|
     ss.dependency "#{s.name}/Privacy", version
     ss.dependency "#{s.name}/Interface", version
     ss.dependency 'gRPC-Core', version
-    abseil_version = '~> 1.20240116.2'
+    abseil_version = '~> 1.20240722.0'
     ss.dependency 'abseil/algorithm/container', abseil_version
     ss.dependency 'abseil/base/base', abseil_version
     ss.dependency 'abseil/base/config', abseil_version
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 5eda92de512..48543720dee 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -47,7 +47,7 @@ Pod::Spec.new do |s|
   s.requires_arc = false
 
   name = 'grpc'
-  abseil_version = '~> 1.20240116.2'
+  abseil_version = '~> 1.20240722.0'
 
   # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
   # This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include
diff --git a/grpc.gemspec b/grpc.gemspec
index 3ba44548b25..7c4645fc5d2 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -2118,6 +2118,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/container/fixed_array.h )
   s.files += %w( third_party/abseil-cpp/absl/container/flat_hash_map.h )
   s.files += %w( third_party/abseil-cpp/absl/container/flat_hash_set.h )
+  s.files += %w( third_party/abseil-cpp/absl/container/hash_container_defaults.h )
   s.files += %w( third_party/abseil-cpp/absl/container/inlined_vector.h )
   s.files += %w( third_party/abseil-cpp/absl/container/internal/common.h )
   s.files += %w( third_party/abseil-cpp/absl/container/internal/common_policy_traits.h )
@@ -2155,8 +2156,13 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle.cc )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle.h )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/internal/demangle_rust.h )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc )
@@ -2172,6 +2178,8 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/symbolize.h )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc )
+  s.files += %w( third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc )
   s.files += %w( third_party/abseil-cpp/absl/debugging/internal/vdso_support.h )
   s.files += %w( third_party/abseil-cpp/absl/debugging/stacktrace.cc )
@@ -2369,7 +2377,6 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/escaping.h )
-  s.files += %w( third_party/abseil-cpp/absl/strings/internal/has_absl_stringify.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.cc )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/memutil.h )
   s.files += %w( third_party/abseil-cpp/absl/strings/internal/ostringstream.cc )
@@ -2479,6 +2486,7 @@ Gem::Specification.new do |s|
   s.files += %w( third_party/abseil-cpp/absl/types/bad_optional_access.h )
   s.files += %w( third_party/abseil-cpp/absl/types/bad_variant_access.cc )
   s.files += %w( third_party/abseil-cpp/absl/types/bad_variant_access.h )
+  s.files += %w( third_party/abseil-cpp/absl/types/compare.h )
   s.files += %w( third_party/abseil-cpp/absl/types/internal/optional.h )
   s.files += %w( third_party/abseil-cpp/absl/types/internal/span.h )
   s.files += %w( third_party/abseil-cpp/absl/types/internal/variant.h )
diff --git a/package.xml b/package.xml
index 76be79fd6b5..69833761539 100644
--- a/package.xml
+++ b/package.xml
@@ -2122,6 +2122,7 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/container/fixed_array.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/container/flat_hash_map.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/container/flat_hash_set.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/container/hash_container_defaults.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/container/inlined_vector.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/container/internal/common.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/container/internal/common_policy_traits.h" role="src" />
@@ -2159,8 +2160,13 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/address_is_readable.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/demangle.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/demangle.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/demangle_rust.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc" role="src" />
@@ -2176,6 +2182,8 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/stacktrace_win32-inl.inc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/stacktrace_x86-inl.inc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/symbolize.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/internal/vdso_support.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/debugging/stacktrace.cc" role="src" />
@@ -2373,7 +2381,6 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/escaping.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/escaping.h" role="src" />
-    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/has_absl_stringify.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/memutil.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/memutil.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/strings/internal/ostringstream.cc" role="src" />
@@ -2483,6 +2490,7 @@
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/types/bad_optional_access.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/types/bad_variant_access.cc" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/types/bad_variant_access.h" role="src" />
+    <file baseinstalldir="/" name="third_party/abseil-cpp/absl/types/compare.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/types/internal/optional.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/types/internal/span.h" role="src" />
     <file baseinstalldir="/" name="third_party/abseil-cpp/absl/types/internal/variant.h" role="src" />
diff --git a/src/abseil-cpp/preprocessed_builds.yaml b/src/abseil-cpp/preprocessed_builds.yaml
index 6250c0fa12d..5d82f5149bc 100644
--- a/src/abseil-cpp/preprocessed_builds.yaml
+++ b/src/abseil-cpp/preprocessed_builds.yaml
@@ -8,6 +8,7 @@
 - cmake_target: absl::algorithm_container
   deps:
   - absl/algorithm:algorithm
+  - absl/base:config
   - absl/base:core_headers
   - absl/base:nullability
   - absl/meta:type_traits
@@ -155,12 +156,14 @@
 - cmake_target: absl::no_destructor
   deps:
   - absl/base:config
+  - absl/base:nullability
   headers:
   - third_party/abseil-cpp/absl/base/no_destructor.h
   name: absl/base:no_destructor
   src: []
 - cmake_target: absl::nullability
   deps:
+  - absl/base:config
   - absl/base:core_headers
   - absl/meta:type_traits
   headers:
@@ -168,6 +171,16 @@
   - third_party/abseil-cpp/absl/base/nullability.h
   name: absl/base:nullability
   src: []
+- cmake_target: absl::poison
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/base:malloc_internal
+  headers:
+  - third_party/abseil-cpp/absl/base/internal/poison.h
+  name: absl/base:poison
+  src:
+  - third_party/abseil-cpp/absl/base/internal/poison.cc
 - cmake_target: absl::prefetch
   deps:
   - absl/base:config
@@ -247,6 +260,7 @@
   src: []
 - cmake_target: absl::btree
   deps:
+  - absl/base:config
   - absl/base:core_headers
   - absl/base:raw_logging_internal
   - absl/base:throw_delegate
@@ -260,7 +274,6 @@
   - absl/strings:cord
   - absl/strings:strings
   - absl/types:compare
-  - absl/utility:utility
   headers:
   - third_party/abseil-cpp/absl/container/btree_map.h
   - third_party/abseil-cpp/absl/container/btree_set.h
@@ -318,9 +331,9 @@
   - absl/algorithm:container
   - absl/base:core_headers
   - absl/container:container_memory
-  - absl/container:hash_function_defaults
+  - absl/container:hash_container_defaults
   - absl/container:raw_hash_map
-  - absl/memory:memory
+  - absl/meta:type_traits
   headers:
   - third_party/abseil-cpp/absl/container/flat_hash_map.h
   name: absl/container:flat_hash_map
@@ -330,17 +343,28 @@
   - absl/algorithm:container
   - absl/base:core_headers
   - absl/container:container_memory
-  - absl/container:hash_function_defaults
+  - absl/container:hash_container_defaults
   - absl/container:raw_hash_set
   - absl/memory:memory
+  - absl/meta:type_traits
   headers:
   - third_party/abseil-cpp/absl/container/flat_hash_set.h
   name: absl/container:flat_hash_set
   src: []
+- cmake_target: absl::hash_container_defaults
+  deps:
+  - absl/base:config
+  - absl/container:hash_function_defaults
+  headers:
+  - third_party/abseil-cpp/absl/container/hash_container_defaults.h
+  name: absl/container:hash_container_defaults
+  src: []
 - cmake_target: absl::hash_function_defaults
   deps:
   - absl/base:config
+  - absl/container:common
   - absl/hash:hash
+  - absl/meta:type_traits
   - absl/strings:cord
   - absl/strings:strings
   headers:
@@ -374,6 +398,7 @@
   - absl/base:base
   - absl/base:config
   - absl/base:core_headers
+  - absl/base:no_destructor
   - absl/base:raw_logging_internal
   - absl/debugging:stacktrace
   - absl/memory:memory
@@ -402,6 +427,7 @@
   src: []
 - cmake_target: absl::inlined_vector_internal
   deps:
+  - absl/base:base_internal
   - absl/base:config
   - absl/base:core_headers
   - absl/container:compressed_tuple
@@ -430,10 +456,11 @@
   - absl/algorithm:container
   - absl/base:core_headers
   - absl/container:container_memory
-  - absl/container:hash_function_defaults
+  - absl/container:hash_container_defaults
   - absl/container:node_slot_policy
   - absl/container:raw_hash_map
   - absl/memory:memory
+  - absl/meta:type_traits
   headers:
   - third_party/abseil-cpp/absl/container/node_hash_map.h
   name: absl/container:node_hash_map
@@ -442,10 +469,12 @@
   deps:
   - absl/algorithm:container
   - absl/base:core_headers
-  - absl/container:hash_function_defaults
+  - absl/container:container_memory
+  - absl/container:hash_container_defaults
   - absl/container:node_slot_policy
   - absl/container:raw_hash_set
   - absl/memory:memory
+  - absl/meta:type_traits
   headers:
   - third_party/abseil-cpp/absl/container/node_hash_set.h
   name: absl/container:node_hash_set
@@ -526,9 +555,9 @@
 - cmake_target: absl::crc_cord_state
   deps:
   - absl/base:config
+  - absl/base:no_destructor
   - absl/crc:crc32c
   - absl/numeric:bits
-  - absl/strings:strings
   headers:
   - third_party/abseil-cpp/absl/crc/internal/crc_cord_state.h
   name: absl/crc:crc_cord_state
@@ -568,6 +597,14 @@
   - third_party/abseil-cpp/absl/crc/internal/non_temporal_memcpy.h
   name: absl/crc:non_temporal_memcpy
   src: []
+- cmake_target: absl::bounded_utf8_length_sequence
+  deps:
+  - absl/base:config
+  - absl/numeric:bits
+  headers:
+  - third_party/abseil-cpp/absl/debugging/internal/bounded_utf8_length_sequence.h
+  name: absl/debugging:bounded_utf8_length_sequence
+  src: []
 - cmake_target: absl::debugging_internal
   deps:
   - absl/base:config
@@ -584,16 +621,40 @@
   - third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc
   - third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
   - third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc
+- cmake_target: absl::decode_rust_punycode
+  deps:
+  - absl/base:config
+  - absl/base:nullability
+  - absl/debugging:bounded_utf8_length_sequence
+  - absl/debugging:utf8_for_code_point
+  headers:
+  - third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.h
+  name: absl/debugging:decode_rust_punycode
+  src:
+  - third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc
 - cmake_target: absl::demangle_internal
   deps:
   - absl/base:base
   - absl/base:config
   - absl/base:core_headers
+  - absl/base:nullability
+  - absl/debugging:demangle_rust
+  - absl/numeric:bits
   headers:
   - third_party/abseil-cpp/absl/debugging/internal/demangle.h
   name: absl/debugging:demangle_internal
   src:
   - third_party/abseil-cpp/absl/debugging/internal/demangle.cc
+- cmake_target: absl::demangle_rust
+  deps:
+  - absl/base:config
+  - absl/base:core_headers
+  - absl/debugging:decode_rust_punycode
+  headers:
+  - third_party/abseil-cpp/absl/debugging/internal/demangle_rust.h
+  name: absl/debugging:demangle_rust
+  src:
+  - third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc
 - cmake_target: absl::examine_stack
   deps:
   - absl/base:config
@@ -672,6 +733,14 @@
   name: absl/debugging:symbolize
   src:
   - third_party/abseil-cpp/absl/debugging/symbolize.cc
+- cmake_target: absl::utf8_for_code_point
+  deps:
+  - absl/base:config
+  headers:
+  - third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.h
+  name: absl/debugging:utf8_for_code_point
+  src:
+  - third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc
 - cmake_target: absl::flags_commandlineflag
   deps:
   - absl/base:config
@@ -709,9 +778,9 @@
   - third_party/abseil-cpp/absl/flags/usage_config.cc
 - cmake_target: absl::flags
   deps:
-  - absl/base:base
   - absl/base:config
   - absl/base:core_headers
+  - absl/flags:commandlineflag
   - absl/flags:config
   - absl/flags:flag_internal
   - absl/flags:reflection
@@ -1139,6 +1208,7 @@
   - third_party/abseil-cpp/absl/log/internal/proto.cc
 - cmake_target: absl::log_internal_strip
   deps:
+  - absl/base:core_headers
   - absl/base:log_severity
   - absl/log/internal:log_message
   - absl/log/internal:nullstream
@@ -1366,6 +1436,7 @@
   - absl/base:config
   - absl/base:core_headers
   - absl/numeric:bits
+  - absl/types:compare
   headers:
   - third_party/abseil-cpp/absl/numeric/int128.h
   - third_party/abseil-cpp/absl/numeric/int128_have_intrinsic.inc
@@ -1453,12 +1524,25 @@
   src: []
 - cmake_target: absl::random_internal_mock_helpers
   deps:
+  - absl/base:config
   - absl/base:fast_type_id
   - absl/types:optional
   headers:
   - third_party/abseil-cpp/absl/random/internal/mock_helpers.h
   name: absl/random/internal:mock_helpers
   src: []
+- cmake_target: ''
+  deps:
+  - absl/base:config
+  - absl/base:raw_logging_internal
+  - absl/random/internal:iostream_state_saver
+  - absl/random/internal:uniform_helper
+  - absl/strings:string_view
+  - absl/strings:strings
+  headers:
+  - third_party/abseil-cpp/absl/random/internal/mock_validators.h
+  name: absl/random/internal:mock_validators
+  src: []
 - cmake_target: ''
   deps:
   - absl/base:config
@@ -1615,7 +1699,6 @@
   deps:
   - absl/base:config
   - absl/meta:type_traits
-  - absl/numeric:int128
   - absl/random/internal:traits
   headers:
   - third_party/abseil-cpp/absl/random/internal/uniform_helper.h
@@ -1698,10 +1781,12 @@
 - cmake_target: absl::random_seed_sequences
   deps:
   - absl/base:config
+  - absl/base:nullability
   - absl/random/internal:pool_urbg
   - absl/random/internal:salted_seed_seq
   - absl/random/internal:seed_material
   - absl/random:seed_gen_exception
+  - absl/strings:string_view
   - absl/types:span
   headers:
   - third_party/abseil-cpp/absl/random/seed_sequences.h
@@ -1786,6 +1871,7 @@
   - absl/strings:cordz_update_tracker
   - absl/strings:internal
   - absl/strings:strings
+  - absl/types:compare
   - absl/types:optional
   - absl/types:span
   headers:
@@ -1844,8 +1930,8 @@
   - third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc
 - cmake_target: absl::cordz_handle
   deps:
-  - absl/base:base
   - absl/base:config
+  - absl/base:no_destructor
   - absl/base:raw_logging_internal
   - absl/synchronization:synchronization
   headers:
@@ -2014,7 +2100,6 @@
   - third_party/abseil-cpp/absl/strings/internal/charconv_bigint.h
   - third_party/abseil-cpp/absl/strings/internal/charconv_parse.h
   - third_party/abseil-cpp/absl/strings/internal/damerau_levenshtein_distance.h
-  - third_party/abseil-cpp/absl/strings/internal/has_absl_stringify.h
   - third_party/abseil-cpp/absl/strings/internal/memutil.h
   - third_party/abseil-cpp/absl/strings/internal/stl_type_traits.h
   - third_party/abseil-cpp/absl/strings/internal/str_join_internal.h
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 7c9601a6fe8..fde998c3af6 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -893,9 +893,12 @@ CORE_SOURCE_FILES = [
     'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc',
     'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc',
     'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc',
     'third_party/abseil-cpp/absl/debugging/internal/demangle.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc',
     'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc',
     'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc',
     'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc',
     'third_party/abseil-cpp/absl/debugging/stacktrace.cc',
     'third_party/abseil-cpp/absl/debugging/symbolize.cc',
diff --git a/src/python/grpcio_observability/observability_lib_deps.py b/src/python/grpcio_observability/observability_lib_deps.py
index 471b6603806..9896cd7368b 100644
--- a/src/python/grpcio_observability/observability_lib_deps.py
+++ b/src/python/grpcio_observability/observability_lib_deps.py
@@ -87,9 +87,12 @@ CC_FILES=[
     'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc',
     'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc',
     'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc',
     'third_party/abseil-cpp/absl/debugging/internal/demangle.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc',
     'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc',
     'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc',
     'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc',
     'third_party/abseil-cpp/absl/debugging/stacktrace.cc',
     'third_party/abseil-cpp/absl/debugging/symbolize.cc',
diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template
index ffc8b75d415..a78254b12b6 100644
--- a/templates/gRPC-C++.podspec.template
+++ b/templates/gRPC-C++.podspec.template
@@ -184,7 +184,7 @@
       ss.dependency "#{s.name}/Privacy", version
       ss.dependency "#{s.name}/Interface", version
       ss.dependency 'gRPC-Core', version
-      abseil_version = '~> 1.20240116.2'
+      abseil_version = '~> 1.20240722.0'
       % for abseil_spec in grpcpp_abseil_specs:
       ss.dependency '${abseil_spec}', abseil_version
       % endfor
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index b6ffab39cdf..2de614df573 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -123,7 +123,7 @@
     s.requires_arc = false
 
     name = 'grpc'
-    abseil_version = '~> 1.20240116.2'
+    abseil_version = '~> 1.20240722.0'
 
     # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework.
     # This lets users write their includes like `#include <grpc/grpc.h>` as opposed to `#include
diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp
index 4a2c63365ef..4447c7562e3 160000
--- a/third_party/abseil-cpp
+++ b/third_party/abseil-cpp
@@ -1 +1 @@
-Subproject commit 4a2c63365eff8823a5221db86ef490e828306f9d
+Subproject commit 4447c7562e3bc702ade25105912dce503f0c4010
diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
index 2caad754ab6..00696e3486d 100644
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@@ -38,9 +38,12 @@ CC_FILES=[
     'third_party/abseil-cpp/absl/crc/internal/crc_non_temporal_memcpy.cc',
     'third_party/abseil-cpp/absl/crc/internal/crc_x86_arm_combined.cc',
     'third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/decode_rust_punycode.cc',
     'third_party/abseil-cpp/absl/debugging/internal/demangle.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/demangle_rust.cc',
     'third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc',
     'third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc',
+    'third_party/abseil-cpp/absl/debugging/internal/utf8_for_code_point.cc',
     'third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc',
     'third_party/abseil-cpp/absl/debugging/stacktrace.cc',
     'third_party/abseil-cpp/absl/debugging/symbolize.cc',
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index c2d0e3c4194..ab9c7c1cd6a 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)
 
 git submodule | sed 's/+//g' | awk '{ print $2 " " $1 }' | sort >"$submodules"
 cat <<EOF | sort >"$want_submodules"
-third_party/abseil-cpp 4a2c63365eff8823a5221db86ef490e828306f9d
+third_party/abseil-cpp 4447c7562e3bc702ade25105912dce503f0c4010
 third_party/benchmark 344117638c8ff7e239044fd0fa7085839fc03021
 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2
 third_party/boringssl-with-bazel b8b3e6e11166719a8ebfa43c0cde9ad7d57a84f6

From 05d214ee86c62741b719569509ba7d0a066d7755 Mon Sep 17 00:00:00 2001
From: Vignesh Babu <vigneshbabu@google.com>
Date: Fri, 27 Sep 2024 14:57:51 -0700
Subject: [PATCH 12/74] [tracing] Add latent see annotations to the filter
 stack.

This would allow us to better attribute time spent in different filters.

PiperOrigin-RevId: 679739129
---
 BUILD                                         |  1 +
 src/core/BUILD                                | 12 +++++++
 .../backend_metrics/backend_metric_filter.cc  |  3 ++
 .../filters/http/client/http_client_filter.cc |  7 ++++
 .../filters/http/client_authority_filter.cc   |  3 ++
 .../message_compress/compression_filter.cc    | 17 +++++++++
 .../filters/http/server/http_server_filter.cc |  7 ++++
 .../server_load_reporting_filter.cc           |  6 ++++
 .../ext/filters/logging/logging_filter.cc     | 25 +++++++++++++
 .../message_size/message_size_filter.cc       |  9 +++++
 src/core/ext/filters/rbac/rbac_filter.cc      |  2 ++
 .../stateful_session_filter.cc                |  7 ++++
 src/core/lib/channel/promise_based_filter.cc  | 35 ++++++++++---------
 src/core/lib/channel/promise_based_filter.h   |  3 +-
 .../authorization/grpc_server_authz_filter.cc |  3 ++
 .../grpclb/client_load_reporting_filter.cc    |  7 ++++
 src/core/server/server_call_tracer_filter.cc  |  8 +++++
 .../server/server_config_selector_filter.cc   |  3 ++
 .../service_config_channel_arg_filter.cc      |  3 ++
 src/core/util/latent_see.cc                   | 22 ++++++++----
 src/core/util/latent_see.h                    |  7 ++++
 21 files changed, 167 insertions(+), 23 deletions(-)

diff --git a/BUILD b/BUILD
index c2d1c88a7d6..0a0a13ee091 100644
--- a/BUILD
+++ b/BUILD
@@ -4362,6 +4362,7 @@ grpc_cc_library(
         "//src/core:experiments",
         "//src/core:grpc_message_size_filter",
         "//src/core:latch",
+        "//src/core:latent_see",
         "//src/core:map",
         "//src/core:metadata_batch",
         "//src/core:percent_encoding",
diff --git a/src/core/BUILD b/src/core/BUILD
index 0de80c1f68a..5f6adbeb898 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -199,6 +199,7 @@ grpc_cc_library(
         "channel_fwd",
         "channel_stack_type",
         "context",
+        "latent_see",
         "map",
         "pipe",
         "//:call_tracer",
@@ -3539,6 +3540,7 @@ grpc_cc_library(
         "context",
         "grpc_message_size_filter",
         "grpc_service_config",
+        "latent_see",
         "metadata_batch",
         "service_config_parser",
         "//:channel_arg_names",
@@ -3814,6 +3816,7 @@ grpc_cc_library(
         "event_engine_context",
         "grpc_server_config_selector",
         "grpc_service_config",
+        "latent_see",
         "metadata_batch",
         "status_helper",
         "//:gpr",
@@ -3941,6 +3944,7 @@ grpc_cc_library(
         "channel_fwd",
         "dual_ref_counted",
         "endpoint_info_handshaker",
+        "latent_see",
         "load_file",
         "metadata_batch",
         "ref_counted",
@@ -4853,6 +4857,7 @@ grpc_cc_library(
         "channel_args",
         "channel_fwd",
         "channel_stack_type",
+        "latent_see",
         "metadata_batch",
         "slice",
         "//:channel_arg_names",
@@ -4892,6 +4897,7 @@ grpc_cc_library(
         "json_args",
         "json_object_loader",
         "latch",
+        "latent_see",
         "metadata_batch",
         "race",
         "service_config_parser",
@@ -4982,6 +4988,7 @@ grpc_cc_library(
         "json",
         "json_args",
         "json_object_loader",
+        "latent_see",
         "metadata_batch",
         "service_config_parser",
         "validation_errors",
@@ -5021,6 +5028,7 @@ grpc_cc_library(
         "json",
         "json_args",
         "json_object_loader",
+        "latent_see",
         "map",
         "metadata_batch",
         "pipe",
@@ -5128,6 +5136,7 @@ grpc_cc_library(
         "json",
         "json_args",
         "json_object_loader",
+        "latent_see",
         "lb_policy",
         "lb_policy_factory",
         "lb_policy_registry",
@@ -6893,6 +6902,7 @@ grpc_cc_library(
         "channel_stack_type",
         "context",
         "grpc_sockaddr",
+        "latent_see",
         "metadata_batch",
         "resolved_address",
         "seq",
@@ -6937,6 +6947,7 @@ grpc_cc_library(
         "experiments",
         "grpc_backend_metric_data",
         "grpc_backend_metric_provider",
+        "latent_see",
         "map",
         "metadata_batch",
         "slice",
@@ -7880,6 +7891,7 @@ grpc_cc_library(
         "channel_fwd",
         "channel_stack_type",
         "context",
+        "latent_see",
         "logging_sink",
         "map",
         "metadata_batch",
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
index 647ff45c30e..da589a303b7 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
@@ -43,6 +43,7 @@
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/load_balancing/backend_metric_data.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -125,6 +126,8 @@ BackendMetricFilter::Create(const ChannelArgs&, ChannelFilter::Args) {
 }
 
 void BackendMetricFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "BackendMetricFilter::Call::OnServerTrailingMetadata");
   if (md.get(GrpcCallWasCancelled()).value_or(false)) return;
   auto* ctx = MaybeGetContext<BackendMetricProvider>();
   if (ctx == nullptr) {
diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc
index 7fd04a371e4..f46b3641b61 100644
--- a/src/core/ext/filters/http/client/http_client_filter.cc
+++ b/src/core/ext/filters/http/client/http_client_filter.cc
@@ -49,6 +49,7 @@
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -113,6 +114,8 @@ Slice UserAgentFromArgs(const ChannelArgs& args,
 
 void HttpClientFilter::Call::OnClientInitialMetadata(ClientMetadata& md,
                                                      HttpClientFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "HttpClientFilter::Call::OnClientInitialMetadata");
   if (filter->test_only_use_put_requests_) {
     md.Set(HttpMethodMetadata(), HttpMethodMetadata::kPut);
   } else {
@@ -126,11 +129,15 @@ void HttpClientFilter::Call::OnClientInitialMetadata(ClientMetadata& md,
 
 absl::Status HttpClientFilter::Call::OnServerInitialMetadata(
     ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "HttpClientFilter::Call::OnServerInitialMetadata");
   return CheckServerMetadata(&md);
 }
 
 absl::Status HttpClientFilter::Call::OnServerTrailingMetadata(
     ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "HttpClientFilter::Call::OnServerTrailingMetadata");
   return CheckServerMetadata(&md);
 }
 
diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc
index 6dd44234151..b43e6a65b2b 100644
--- a/src/core/ext/filters/http/client_authority_filter.cc
+++ b/src/core/ext/filters/http/client_authority_filter.cc
@@ -34,6 +34,7 @@
 #include "src/core/lib/security/transport/auth_filters.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -59,6 +60,8 @@ ClientAuthorityFilter::Create(const ChannelArgs& args, ChannelFilter::Args) {
 
 void ClientAuthorityFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, ClientAuthorityFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientAuthorityFilter::Call::OnClientInitialMetadata");
   // If no authority is set, set the default authority.
   if (md.get_pointer(HttpAuthorityMetadata()) == nullptr) {
     md.Set(HttpAuthorityMetadata(), filter->default_authority_.Ref());
diff --git a/src/core/ext/filters/http/message_compress/compression_filter.cc b/src/core/ext/filters/http/message_compress/compression_filter.cc
index dead10bbe15..85a67690206 100644
--- a/src/core/ext/filters/http/message_compress/compression_filter.cc
+++ b/src/core/ext/filters/http/message_compress/compression_filter.cc
@@ -51,6 +51,7 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/telemetry/call_tracer.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -238,48 +239,64 @@ ChannelCompression::DecompressArgs ChannelCompression::HandleIncomingMetadata(
 
 void ClientCompressionFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, ClientCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientCompressionFilter::Call::OnClientInitialMetadata");
   compression_algorithm_ =
       filter->compression_engine_.HandleOutgoingMetadata(md);
 }
 
 MessageHandle ClientCompressionFilter::Call::OnClientToServerMessage(
     MessageHandle message, ClientCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientCompressionFilter::Call::OnClientToServerMessage");
   return filter->compression_engine_.CompressMessage(std::move(message),
                                                      compression_algorithm_);
 }
 
 void ClientCompressionFilter::Call::OnServerInitialMetadata(
     ServerMetadata& md, ClientCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientCompressionFilter::Call::OnServerInitialMetadata");
   decompress_args_ = filter->compression_engine_.HandleIncomingMetadata(md);
 }
 
 absl::StatusOr<MessageHandle>
 ClientCompressionFilter::Call::OnServerToClientMessage(
     MessageHandle message, ClientCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientCompressionFilter::Call::OnServerToClientMessage");
   return filter->compression_engine_.DecompressMessage(
       /*is_client=*/true, std::move(message), decompress_args_);
 }
 
 void ServerCompressionFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, ServerCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerCompressionFilter::Call::OnClientInitialMetadata");
   decompress_args_ = filter->compression_engine_.HandleIncomingMetadata(md);
 }
 
 absl::StatusOr<MessageHandle>
 ServerCompressionFilter::Call::OnClientToServerMessage(
     MessageHandle message, ServerCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerCompressionFilter::Call::OnClientToServerMessage");
   return filter->compression_engine_.DecompressMessage(
       /*is_client=*/false, std::move(message), decompress_args_);
 }
 
 void ServerCompressionFilter::Call::OnServerInitialMetadata(
     ServerMetadata& md, ServerCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerCompressionFilter::Call::OnServerInitialMetadata");
   compression_algorithm_ =
       filter->compression_engine_.HandleOutgoingMetadata(md);
 }
 
 MessageHandle ServerCompressionFilter::Call::OnServerToClientMessage(
     MessageHandle message, ServerCompressionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerCompressionFilter::Call::OnServerToClientMessage");
   return filter->compression_engine_.CompressMessage(std::move(message),
                                                      compression_algorithm_);
 }
diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc
index fa6a38ddcc0..92e541775e5 100644
--- a/src/core/ext/filters/http/server/http_server_filter.cc
+++ b/src/core/ext/filters/http/server/http_server_filter.cc
@@ -45,6 +45,7 @@
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -77,6 +78,8 @@ ServerMetadataHandle MalformedRequest(absl::string_view explanation) {
 
 ServerMetadataHandle HttpServerFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, HttpServerFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "HttpServerFilter::Call::OnClientInitialMetadata");
   auto method = md.get(HttpMethodMetadata());
   if (method.has_value()) {
     switch (*method) {
@@ -139,6 +142,8 @@ ServerMetadataHandle HttpServerFilter::Call::OnClientInitialMetadata(
 }
 
 void HttpServerFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "HttpServerFilter::Call::OnServerInitialMetadata");
   GRPC_TRACE_LOG(call, INFO)
       << GetContext<Activity>()->DebugTag() << "[http-server] Write metadata";
   FilterOutgoingMetadata(&md);
@@ -147,6 +152,8 @@ void HttpServerFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
 }
 
 void HttpServerFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "HttpServerFilter::Call::OnServerTrailingMetadata");
   FilterOutgoingMetadata(&md);
 }
 
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
index 928a50867e3..48cb742e505 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
@@ -61,6 +61,7 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/uri.h"
 #include "src/cpp/server/load_reporter/constants.h"
 
@@ -181,6 +182,8 @@ const char* GetStatusTagForStatus(grpc_status_code status) {
 
 void ServerLoadReportingFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, ServerLoadReportingFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoadReportingFilter::Call::OnClientInitialMetadata");
   // Gather up basic facts about the request
   Slice service_method;
   if (const Slice* path = md.get_pointer(HttpPathMetadata())) {
@@ -205,6 +208,8 @@ void ServerLoadReportingFilter::Call::OnClientInitialMetadata(
 
 void ServerLoadReportingFilter::Call::OnServerTrailingMetadata(
     ServerMetadata& md, ServerLoadReportingFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoadReportingFilter::Call::OnServerTrailingMetadata");
   const auto& costs = md.Take(LbCostBinMetadata());
   for (const auto& cost : costs) {
     opencensus::stats::Record(
@@ -222,6 +227,7 @@ void ServerLoadReportingFilter::Call::OnServerTrailingMetadata(
 
 void ServerLoadReportingFilter::Call::OnFinalize(
     const grpc_call_final_info* final_info, ServerLoadReportingFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE("ServerLoadReportingFilter::Call::OnFinalize");
   if (final_info == nullptr) return;
   // After the last bytes have been placed on the wire we record
   // final measurements
diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc
index 1963f823665..cf12d8bb6ac 100644
--- a/src/core/ext/filters/logging/logging_filter.cc
+++ b/src/core/ext/filters/logging/logging_filter.cc
@@ -67,6 +67,7 @@
 #include "src/core/resolver/resolver_registry.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/util/host_port.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/time.h"
 #include "src/core/util/uri.h"
 
@@ -359,6 +360,8 @@ ClientLoggingFilter::Create(const ChannelArgs& args,
 
 void ClientLoggingFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, ClientLoggingFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoggingFilter::Call::OnClientInitialMetadata");
   call_data_.emplace(true, md, filter->default_authority_);
   if (!call_data_->ShouldLog()) {
     call_data_.reset();
@@ -369,6 +372,8 @@ void ClientLoggingFilter::Call::OnClientInitialMetadata(
 }
 
 void ClientLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoggingFilter::Call::OnServerInitialMetadata");
   if (!call_data_.has_value()) return;
   call_data_->LogServerHeader(
       /*is_client=*/true, MaybeGetContext<CallTracerAnnotationInterface>(),
@@ -376,6 +381,8 @@ void ClientLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
 }
 
 void ClientLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoggingFilter::Call::OnServerTrailingMetadata");
   if (!call_data_.has_value()) return;
   if (md.get(GrpcCallWasCancelled()).value_or(false) &&
       md.get(GrpcStatusMetadata()) == GRPC_STATUS_CANCELLED) {
@@ -390,6 +397,8 @@ void ClientLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
 
 void ClientLoggingFilter::Call::OnClientToServerMessage(
     const Message& message) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoggingFilter::Call::OnClientToServerMessage");
   if (!call_data_.has_value()) return;
   call_data_->LogClientMessage(
       /*is_client=*/true, MaybeGetContext<CallTracerAnnotationInterface>(),
@@ -397,6 +406,8 @@ void ClientLoggingFilter::Call::OnClientToServerMessage(
 }
 
 void ClientLoggingFilter::Call::OnClientToServerHalfClose() {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoggingFilter::Call::OnClientToServerHalfClose");
   if (!call_data_.has_value()) return;
   call_data_->LogClientHalfClose(
       /*is_client=*/true, MaybeGetContext<CallTracerAnnotationInterface>());
@@ -404,6 +415,8 @@ void ClientLoggingFilter::Call::OnClientToServerHalfClose() {
 
 void ClientLoggingFilter::Call::OnServerToClientMessage(
     const Message& message) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoggingFilter::Call::OnServerToClientMessage");
   if (!call_data_.has_value()) return;
   call_data_->LogServerMessage(
       /*is_client=*/true, MaybeGetContext<CallTracerAnnotationInterface>(),
@@ -424,6 +437,8 @@ ServerLoggingFilter::Create(const ChannelArgs& /*args*/,
 
 // Construct a promise for one call.
 void ServerLoggingFilter::Call::OnClientInitialMetadata(ClientMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoggingFilter::Call::OnClientInitialMetadata");
   call_data_.emplace(false, md, "");
   if (!call_data_->ShouldLog()) {
     call_data_.reset();
@@ -435,6 +450,8 @@ void ServerLoggingFilter::Call::OnClientInitialMetadata(ClientMetadata& md) {
 }
 
 void ServerLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoggingFilter::Call::OnServerInitialMetadata");
   if (!call_data_.has_value()) return;
   call_data_->LogServerHeader(
       /*is_client=*/false, MaybeGetContext<CallTracerAnnotationInterface>(),
@@ -442,6 +459,8 @@ void ServerLoggingFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
 }
 
 void ServerLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoggingFilter::Call::OnServerTrailingMetadata");
   if (!call_data_.has_value()) return;
   if (md.get(GrpcCallWasCancelled()).value_or(false) &&
       md.get(GrpcStatusMetadata()) == GRPC_STATUS_CANCELLED) {
@@ -456,6 +475,8 @@ void ServerLoggingFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
 
 void ServerLoggingFilter::Call::OnClientToServerMessage(
     const Message& message) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoggingFilter::Call::OnClientToServerMessage");
   if (!call_data_.has_value()) return;
   call_data_->LogClientMessage(
       /*is_client=*/false, MaybeGetContext<CallTracerAnnotationInterface>(),
@@ -463,6 +484,8 @@ void ServerLoggingFilter::Call::OnClientToServerMessage(
 }
 
 void ServerLoggingFilter::Call::OnClientToServerHalfClose() {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoggingFilter::Call::OnClientToServerHalfClose");
   if (!call_data_.has_value()) return;
   call_data_->LogClientHalfClose(
       /*is_client=*/false, MaybeGetContext<CallTracerAnnotationInterface>());
@@ -470,6 +493,8 @@ void ServerLoggingFilter::Call::OnClientToServerHalfClose() {
 
 void ServerLoggingFilter::Call::OnServerToClientMessage(
     const Message& message) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerLoggingFilter::Call::OnServerToClientMessage");
   if (!call_data_.has_value()) return;
   call_data_->LogServerMessage(
       /*is_client=*/false, MaybeGetContext<CallTracerAnnotationInterface>(),
diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc
index db0b4d514e7..01cc9a3a9d7 100644
--- a/src/core/ext/filters/message_size/message_size_filter.cc
+++ b/src/core/ext/filters/message_size/message_size_filter.cc
@@ -44,6 +44,7 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/service_config/service_config_call_data.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -201,24 +202,32 @@ ClientMessageSizeFilter::Call::Call(ClientMessageSizeFilter* filter)
 
 ServerMetadataHandle ServerMessageSizeFilter::Call::OnClientToServerMessage(
     const Message& message, ServerMessageSizeFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerMessageSizeFilter::Call::OnClientToServerMessage");
   return CheckPayload(message, filter->parsed_config_.max_recv_size(),
                       /*is_client=*/false, false);
 }
 
 ServerMetadataHandle ServerMessageSizeFilter::Call::OnServerToClientMessage(
     const Message& message, ServerMessageSizeFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerMessageSizeFilter::Call::OnServerToClientMessage");
   return CheckPayload(message, filter->parsed_config_.max_send_size(),
                       /*is_client=*/false, true);
 }
 
 ServerMetadataHandle ClientMessageSizeFilter::Call::OnClientToServerMessage(
     const Message& message) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientMessageSizeFilter::Call::OnClientToServerMessage");
   return CheckPayload(message, limits_.max_send_size(), /*is_client=*/true,
                       true);
 }
 
 ServerMetadataHandle ClientMessageSizeFilter::Call::OnServerToClientMessage(
     const Message& message) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientMessageSizeFilter::Call::OnServerToClientMessage");
   return CheckPayload(message, limits_.max_recv_size(), /*is_client=*/true,
                       false);
 }
diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc
index 583042786f0..c7a8d139b17 100644
--- a/src/core/ext/filters/rbac/rbac_filter.cc
+++ b/src/core/ext/filters/rbac/rbac_filter.cc
@@ -39,6 +39,7 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/service_config/service_config_call_data.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -51,6 +52,7 @@ const NoInterceptor RbacFilter::Call::OnFinalize;
 
 absl::Status RbacFilter::Call::OnClientInitialMetadata(ClientMetadata& md,
                                                        RbacFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE("RbacFilter::Call::OnClientInitialMetadata");
   // Fetch and apply the rbac policy from the service config.
   auto* service_config_call_data = GetContext<ServiceConfigCallData>();
   auto* method_params = static_cast<RbacMethodParsedConfig*>(
diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
index 953a32a511b..3852c7155bb 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
@@ -51,6 +51,7 @@
 #include "src/core/resolver/xds/xds_resolver_attributes.h"
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/util/crash.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/time.h"
 
 namespace grpc_core {
@@ -219,6 +220,8 @@ bool IsConfiguredPath(absl::string_view configured_path,
 
 void StatefulSessionFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, StatefulSessionFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "StatefulSessionFilter::Call::OnClientInitialMetadata");
   // Get config.
   auto* service_config_call_data = GetContext<ServiceConfigCallData>();
   CHECK_NE(service_config_call_data, nullptr);
@@ -258,6 +261,8 @@ void StatefulSessionFilter::Call::OnClientInitialMetadata(
 }
 
 void StatefulSessionFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "StatefulSessionFilter::Call::OnServerInitialMetadata");
   if (!perform_filtering_) return;
   // Add cookie to server initial metadata if needed.
   MaybeUpdateServerInitialMetadata(cookie_config_, cluster_changed_,
@@ -266,6 +271,8 @@ void StatefulSessionFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
 }
 
 void StatefulSessionFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "StatefulSessionFilter::Call::OnServerTrailingMetadata");
   if (!perform_filtering_) return;
   // If we got a Trailers-Only response, then add the
   // cookie to the trailing metadata instead of the
diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc
index bf5dadfc804..d7409e63d1d 100644
--- a/src/core/lib/channel/promise_based_filter.cc
+++ b/src/core/lib/channel/promise_based_filter.cc
@@ -38,6 +38,7 @@
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/crash.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/manual_constructor.h"
 #include "src/core/util/status_helper.h"
 
@@ -242,10 +243,8 @@ void BaseCallData::CapturedBatch::CancelWith(grpc_error_handle error,
 ///////////////////////////////////////////////////////////////////////////////
 // BaseCallData::Flusher
 
-BaseCallData::Flusher::Flusher(BaseCallData* call)
-    : latent_see::InnerScope(
-          GRPC_LATENT_SEE_METADATA("PromiseBasedFilter Flusher")),
-      call_(call) {
+BaseCallData::Flusher::Flusher(BaseCallData* call, const char* desc)
+    : latent_see::InnerScope(GRPC_LATENT_SEE_METADATA_RAW(desc)), call_(call) {
   GRPC_CALL_STACK_REF(call_->call_stack(), "flusher");
 }
 
@@ -397,7 +396,7 @@ bool BaseCallData::SendMessage::IsIdle() const {
 }
 
 void BaseCallData::SendMessage::OnComplete(absl::Status status) {
-  Flusher flusher(base_);
+  Flusher flusher(base_, "SendMessage::OnComplete");
   GRPC_TRACE_LOG(channel, INFO)
       << base_->LogTag() << " SendMessage.OnComplete st=" << StateString(state_)
       << " status=" << status;
@@ -707,7 +706,7 @@ void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) {
       break;
   }
   completed_status_ = status;
-  Flusher flusher(base_);
+  Flusher flusher(base_, "ReceiveMessage::OnComplete");
   ScopedContext ctx(base_);
   base_->WakeInsideCombiner(&flusher);
 }
@@ -1221,7 +1220,8 @@ class ClientCallData::PollContext {
         auto* next_poll = static_cast<NextPoll*>(p);
         {
           ScopedContext ctx(next_poll->call_data);
-          Flusher flusher(next_poll->call_data);
+          Flusher flusher(next_poll->call_data,
+                          "ClientCallData::PollContext::~PollContext");
           next_poll->call_data->WakeInsideCombiner(&flusher);
         }
         GRPC_CALL_STACK_UNREF(next_poll->call_stack, "re-poll");
@@ -1350,7 +1350,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) {
   // Fake out the activity based context.
   ScopedContext context(this);
   CapturedBatch batch(b);
-  Flusher flusher(this);
+  Flusher flusher(this, "ClientCallData::StartBatch");
 
   GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch " << DebugString();
 
@@ -1556,7 +1556,7 @@ void ClientCallData::RecvInitialMetadataReady(grpc_error_handle error) {
       << DebugString() << " error:" << error.ToString()
       << " md:" << recv_initial_metadata_->metadata->DebugString();
   ScopedContext context(this);
-  Flusher flusher(this);
+  Flusher flusher(this, "ClientCallData::RecvInitialMetadataReady");
   if (!error.ok()) {
     switch (recv_initial_metadata_->state) {
       case RecvInitialMetadata::kHookedWaitingForPipe:
@@ -1742,7 +1742,7 @@ void ClientCallData::RecvTrailingMetadataReadyCallback(
 }
 
 void ClientCallData::RecvTrailingMetadataReady(grpc_error_handle error) {
-  Flusher flusher(this);
+  Flusher flusher(this, "ClientCallData::RecvTrailingMetadataReady");
   GRPC_TRACE_LOG(channel, INFO)
       << LogTag() << " ClientCallData.RecvTrailingMetadataReady "
       << "recv_trailing_state=" << StateString(recv_trailing_state_)
@@ -1793,11 +1793,12 @@ void ClientCallData::SetStatusFromError(grpc_metadata_batch* metadata,
 
 // Wakeup and poll the promise if appropriate.
 void ClientCallData::WakeInsideCombiner(Flusher* flusher) {
+  GRPC_LATENT_SEE_INNER_SCOPE("ClientCallData::WakeInsideCombiner");
   PollContext(this, flusher).Run();
 }
 
 void ClientCallData::OnWakeup() {
-  Flusher flusher(this);
+  Flusher flusher(this, "ClientCallData::OnWakeup");
   ScopedContext context(this);
   WakeInsideCombiner(&flusher);
 }
@@ -1873,7 +1874,8 @@ class ServerCallData::PollContext {
       auto run = [](void* p, grpc_error_handle) {
         auto* next_poll = static_cast<NextPoll*>(p);
         {
-          Flusher flusher(next_poll->call_data);
+          Flusher flusher(next_poll->call_data,
+                          "ServerCallData::PollContext::~PollContext");
           ScopedContext context(next_poll->call_data);
           next_poll->call_data->WakeInsideCombiner(&flusher);
         }
@@ -1977,7 +1979,7 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) {
   // Fake out the activity based context.
   ScopedContext context(this);
   CapturedBatch batch(b);
-  Flusher flusher(this);
+  Flusher flusher(this, "ServerCallData::StartBatch");
   bool wake = false;
 
   GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch: " << DebugString();
@@ -2266,7 +2268,7 @@ void ServerCallData::RecvTrailingMetadataReady(grpc_error_handle error) {
   GRPC_TRACE_LOG(channel, INFO)
       << LogTag() << ": RecvTrailingMetadataReady error=" << error
       << " md=" << recv_trailing_metadata_->DebugString();
-  Flusher flusher(this);
+  Flusher flusher(this, "ServerCallData::RecvTrailingMetadataReady");
   PollContext poll_ctx(this, &flusher);
   Completed(error, recv_trailing_metadata_->get(GrpcTarPit()).has_value(),
             &flusher);
@@ -2280,7 +2282,7 @@ void ServerCallData::RecvInitialMetadataReadyCallback(void* arg,
 }
 
 void ServerCallData::RecvInitialMetadataReady(grpc_error_handle error) {
-  Flusher flusher(this);
+  Flusher flusher(this, "ServerCallData::RecvInitialMetadataReady");
   GRPC_TRACE_LOG(channel, INFO)
       << LogTag() << ": RecvInitialMetadataReady " << error;
   CHECK(recv_initial_state_ == RecvInitialState::kForwarded);
@@ -2343,6 +2345,7 @@ std::string ServerCallData::DebugString() const {
 
 // Wakeup and poll the promise if appropriate.
 void ServerCallData::WakeInsideCombiner(Flusher* flusher) {
+  GRPC_LATENT_SEE_INNER_SCOPE("ServerCallData::WakeInsideCombiner");
   PollContext poll_ctx(this, flusher);
   GRPC_TRACE_LOG(channel, INFO)
       << LogTag() << ": WakeInsideCombiner " << DebugString();
@@ -2494,7 +2497,7 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) {
 }
 
 void ServerCallData::OnWakeup() {
-  Flusher flusher(this);
+  Flusher flusher(this, "ServerCallData::OnWakeup");
   ScopedContext context(this);
   WakeInsideCombiner(&flusher);
 }
diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 6b2ba31ce6b..979c9e7db95 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -976,7 +976,8 @@ class BaseCallData : public Activity, private Wakeable {
 
   class Flusher : public latent_see::InnerScope {
    public:
-    explicit Flusher(BaseCallData* call);
+    explicit Flusher(BaseCallData* call,
+                     const char* desc = "PromiseBasedFilter::Flusher");
     // Calls closures, schedules batches, relinquishes call combiner.
     ~Flusher();
 
diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
index 672b02a9d91..540b2af1f67 100644
--- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc
+++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
@@ -33,6 +33,7 @@
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -99,6 +100,8 @@ bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) {
 
 absl::Status GrpcServerAuthzFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, GrpcServerAuthzFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "GrpcServerAuthzFilter::Call::OnClientInitialMetadata");
   if (!filter->IsAuthorized(md)) {
     return absl::PermissionDeniedError("Unauthorized RPC request rejected.");
   }
diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
index 40de9f0c2bc..4aff5f14580 100644
--- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
+++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
@@ -35,6 +35,7 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
@@ -55,6 +56,8 @@ ClientLoadReportingFilter::Create(const ChannelArgs&, ChannelFilter::Args) {
 
 void ClientLoadReportingFilter::Call::OnClientInitialMetadata(
     ClientMetadata& client_initial_metadata) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoadReportingFilter::Call::OnClientInitialMetadata");
   // Handle client initial metadata.
   // Grab client stats object from metadata.
   auto client_stats_md =
@@ -65,11 +68,15 @@ void ClientLoadReportingFilter::Call::OnClientInitialMetadata(
 }
 
 void ClientLoadReportingFilter::Call::OnServerInitialMetadata(ServerMetadata&) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoadReportingFilter::Call::OnServerInitialMetadata");
   saw_initial_metadata_ = true;
 }
 
 void ClientLoadReportingFilter::Call::OnServerTrailingMetadata(
     ServerMetadata& server_trailing_metadata) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ClientLoadReportingFilter::Call::OnServerTrailingMetadata");
   if (client_stats_ != nullptr) {
     client_stats_->AddCallFinished(
         server_trailing_metadata.get(GrpcStreamNetworkState()) ==
diff --git a/src/core/server/server_call_tracer_filter.cc b/src/core/server/server_call_tracer_filter.cc
index 78f8589cea0..b4fbdafde9c 100644
--- a/src/core/server/server_call_tracer_filter.cc
+++ b/src/core/server/server_call_tracer_filter.cc
@@ -39,6 +39,7 @@
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/telemetry/call_tracer.h"
+#include "src/core/util/latent_see.h"
 
 namespace grpc_core {
 
@@ -57,24 +58,31 @@ class ServerCallTracerFilter
   class Call {
    public:
     void OnClientInitialMetadata(ClientMetadata& client_initial_metadata) {
+      GRPC_LATENT_SEE_INNER_SCOPE(
+          "ServerCallTracerFilter::Call::OnClientInitialMetadata");
       auto* call_tracer = MaybeGetContext<ServerCallTracer>();
       if (call_tracer == nullptr) return;
       call_tracer->RecordReceivedInitialMetadata(&client_initial_metadata);
     }
 
     void OnServerInitialMetadata(ServerMetadata& server_initial_metadata) {
+      GRPC_LATENT_SEE_INNER_SCOPE(
+          "ServerCallTracerFilter::Call::OnServerInitialMetadata");
       auto* call_tracer = MaybeGetContext<ServerCallTracer>();
       if (call_tracer == nullptr) return;
       call_tracer->RecordSendInitialMetadata(&server_initial_metadata);
     }
 
     void OnFinalize(const grpc_call_final_info* final_info) {
+      GRPC_LATENT_SEE_INNER_SCOPE("ServerCallTracerFilter::Call::OnFinalize");
       auto* call_tracer = MaybeGetContext<ServerCallTracer>();
       if (call_tracer == nullptr) return;
       call_tracer->RecordEnd(final_info);
     }
 
     void OnServerTrailingMetadata(ServerMetadata& server_trailing_metadata) {
+      GRPC_LATENT_SEE_INNER_SCOPE(
+          "ServerCallTracerFilter::Call::OnServerTrailingMetadata");
       auto* call_tracer = MaybeGetContext<ServerCallTracer>();
       if (call_tracer == nullptr) return;
       call_tracer->RecordSendTrailingMetadata(&server_trailing_metadata);
diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc
index b17ea44930a..2f221e61426 100644
--- a/src/core/server/server_config_selector_filter.cc
+++ b/src/core/server/server_config_selector_filter.cc
@@ -38,6 +38,7 @@
 #include "src/core/server/server_config_selector.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_call_data.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/status_helper.h"
 #include "src/core/util/sync.h"
@@ -144,6 +145,8 @@ void ServerConfigSelectorFilter::Orphan() {
 
 absl::Status ServerConfigSelectorFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, ServerConfigSelectorFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServerConfigSelectorFilter::Call::OnClientInitialMetadata");
   auto sel = filter->config_selector();
   if (!sel.ok()) return sel.status();
   auto call_config = sel.value()->GetCallConfig(&md);
diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc
index 54b1ae0d411..c17fa1a04d6 100644
--- a/src/core/service_config/service_config_channel_arg_filter.cc
+++ b/src/core/service_config/service_config_channel_arg_filter.cc
@@ -46,6 +46,7 @@
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/service_config/service_config_impl.h"
 #include "src/core/service_config/service_config_parser.h"
+#include "src/core/util/latent_see.h"
 #include "src/core/util/ref_counted_ptr.h"
 
 namespace grpc_core {
@@ -107,6 +108,8 @@ const NoInterceptor ServiceConfigChannelArgFilter::Call::OnFinalize;
 
 void ServiceConfigChannelArgFilter::Call::OnClientInitialMetadata(
     ClientMetadata& md, ServiceConfigChannelArgFilter* filter) {
+  GRPC_LATENT_SEE_INNER_SCOPE(
+      "ServiceConfigChannelArgFilter::Call::OnClientInitialMetadata");
   const ServiceConfigParser::ParsedConfigVector* method_configs = nullptr;
   if (filter->service_config_ != nullptr) {
     method_configs = filter->service_config_->GetMethodParsedConfigVector(
diff --git a/src/core/util/latent_see.cc b/src/core/util/latent_see.cc
index 508e853055a..c8331144407 100644
--- a/src/core/util/latent_see.cc
+++ b/src/core/util/latent_see.cc
@@ -91,12 +91,22 @@ std::string Log::GenerateJson() {
     }
     if (!first) absl::StrAppend(&json, ",\n");
     first = false;
-    absl::StrAppend(&json, "{\"name\": ", event.event.metadata->name,
-                    ", \"ph\": \"", phase, "\", \"ts\": ",
-                    std::chrono::duration<double, std::micro>(
-                        event.event.timestamp - *start_time)
-                        .count(),
-                    ", \"pid\": 0, \"tid\": ", event.thread_id);
+    if (event.event.metadata->name[0] != '"') {
+      absl::StrAppend(&json, "{\"name\": \"", event.event.metadata->name,
+                      "\", \"ph\": \"", phase, "\", \"ts\": ",
+                      std::chrono::duration<unsigned long long, std::nano>(
+                          event.event.timestamp - *start_time)
+                          .count(),
+                      ", \"pid\": 0, \"tid\": ", event.thread_id);
+    } else {
+      absl::StrAppend(&json, "{\"name\": ", event.event.metadata->name,
+                      ", \"ph\": \"", phase, "\", \"ts\": ",
+                      std::chrono::duration<unsigned long long, std::nano>(
+                          event.event.timestamp - *start_time)
+                          .count(),
+                      ", \"pid\": 0, \"tid\": ", event.thread_id);
+    }
+
     if (has_id) {
       absl::StrAppend(&json, ", \"id\": ", event.event.id);
     }
diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h
index 34a247abd0a..19ca150b722 100644
--- a/src/core/util/latent_see.h
+++ b/src/core/util/latent_see.h
@@ -260,6 +260,12 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) {
                                                        #name};             \
     return &metadata;                                                      \
   }()
+#define GRPC_LATENT_SEE_METADATA_RAW(name)                                 \
+  [ptr = name]() {                                                         \
+    static grpc_core::latent_see::Metadata metadata = {__FILE__, __LINE__, \
+                                                       ptr};               \
+    return &metadata;                                                      \
+  }()
 // Parent scope: logs a begin and end event, and flushes the thread log on scope
 // exit. Because the flush takes some time it's better to place one parent scope
 // at the top of the stack, and use lighter weight scopes within it.
@@ -295,6 +301,7 @@ struct InnerScope {
 }  // namespace latent_see
 }  // namespace grpc_core
 #define GRPC_LATENT_SEE_METADATA(name) nullptr
+#define GRPC_LATENT_SEE_METADATA_RAW(name) nullptr
 #define GRPC_LATENT_SEE_PARENT_SCOPE(name) \
   do {                                     \
   } while (0)

From 3ea3e36e95400885a323c9d7447665559c090631 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 27 Sep 2024 15:03:10 -0700
Subject: [PATCH 13/74] [tools] Add a `--fix` argument to check_submodules.sh
 (#37811)

IDK how many times I've messed this up over the years accidentally and had to spend thoughts trying to fix it... when really we could do that trivially with code.

Closes #37811

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37811 from ctiller:bamboozled 0cfbeae925be12fa0e5533c789e992d5d8a9aaff
PiperOrigin-RevId: 679741188
---
 tools/run_tests/sanity/check_submodules.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh
index ab9c7c1cd6a..9796fb593cc 100755
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@@ -43,6 +43,16 @@ third_party/xds 3a472e524827f72d1ad621c4983dd5af54c46776
 third_party/zlib 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851
 EOF
 
-diff -u "$submodules" "$want_submodules"
+if ! diff -u "$submodules" "$want_submodules"; then
+  if [ "$1" = "--fix" ]; then
+    while read -r path commit; do
+      git submodule update --init "$path"
+      (cd "$path" && git checkout "$commit")
+    done <"$want_submodules"
+    exit 0
+  fi
+  echo "Submodules are out of sync. Please update this script or run with --fix."
+  exit 1
+fi
 
 rm "$submodules" "$want_submodules"

From 6b88612d0398365c6696ab371925e2541478c933 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Sat, 28 Sep 2024 22:24:16 -0700
Subject: [PATCH 14/74] [latent-see] Compilation fix for
 use_strict_warning=true (#37815)

Since we don't actually use the `desc` parameter when building without latent_see we had an unused parameter error.
More though, I think the `GRPC_LATENT_SEE_METADATA_RAW` macro was flawed, as the inner `metadata` argument would only be created once, and so all uses would get tagged by whatever passed through `Flusher` first. Correct this by passing in the `latent_see::Metadata*` directly to the function.

Closes #37815

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37815 from ctiller:woah-bubba 606a6350fec07672921780903ac2b054ea583a7d
PiperOrigin-RevId: 680136826
---
 src/core/lib/channel/promise_based_filter.cc | 35 ++++++++++++--------
 src/core/lib/channel/promise_based_filter.h  |  3 +-
 src/core/util/latent_see.h                   |  6 ----
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc
index d7409e63d1d..a0fc813ad5c 100644
--- a/src/core/lib/channel/promise_based_filter.cc
+++ b/src/core/lib/channel/promise_based_filter.cc
@@ -243,8 +243,8 @@ void BaseCallData::CapturedBatch::CancelWith(grpc_error_handle error,
 ///////////////////////////////////////////////////////////////////////////////
 // BaseCallData::Flusher
 
-BaseCallData::Flusher::Flusher(BaseCallData* call, const char* desc)
-    : latent_see::InnerScope(GRPC_LATENT_SEE_METADATA_RAW(desc)), call_(call) {
+BaseCallData::Flusher::Flusher(BaseCallData* call, latent_see::Metadata* desc)
+    : latent_see::InnerScope(desc), call_(call) {
   GRPC_CALL_STACK_REF(call_->call_stack(), "flusher");
 }
 
@@ -396,7 +396,7 @@ bool BaseCallData::SendMessage::IsIdle() const {
 }
 
 void BaseCallData::SendMessage::OnComplete(absl::Status status) {
-  Flusher flusher(base_, "SendMessage::OnComplete");
+  Flusher flusher(base_, GRPC_LATENT_SEE_METADATA("SendMessage::OnComplete"));
   GRPC_TRACE_LOG(channel, INFO)
       << base_->LogTag() << " SendMessage.OnComplete st=" << StateString(state_)
       << " status=" << status;
@@ -706,7 +706,8 @@ void BaseCallData::ReceiveMessage::OnComplete(absl::Status status) {
       break;
   }
   completed_status_ = status;
-  Flusher flusher(base_, "ReceiveMessage::OnComplete");
+  Flusher flusher(base_,
+                  GRPC_LATENT_SEE_METADATA("ReceiveMessage::OnComplete"));
   ScopedContext ctx(base_);
   base_->WakeInsideCombiner(&flusher);
 }
@@ -1221,7 +1222,8 @@ class ClientCallData::PollContext {
         {
           ScopedContext ctx(next_poll->call_data);
           Flusher flusher(next_poll->call_data,
-                          "ClientCallData::PollContext::~PollContext");
+                          GRPC_LATENT_SEE_METADATA(
+                              "ClientCallData::PollContext::~PollContext"));
           next_poll->call_data->WakeInsideCombiner(&flusher);
         }
         GRPC_CALL_STACK_UNREF(next_poll->call_stack, "re-poll");
@@ -1350,7 +1352,7 @@ void ClientCallData::StartBatch(grpc_transport_stream_op_batch* b) {
   // Fake out the activity based context.
   ScopedContext context(this);
   CapturedBatch batch(b);
-  Flusher flusher(this, "ClientCallData::StartBatch");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ClientCallData::StartBatch"));
 
   GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch " << DebugString();
 
@@ -1556,7 +1558,8 @@ void ClientCallData::RecvInitialMetadataReady(grpc_error_handle error) {
       << DebugString() << " error:" << error.ToString()
       << " md:" << recv_initial_metadata_->metadata->DebugString();
   ScopedContext context(this);
-  Flusher flusher(this, "ClientCallData::RecvInitialMetadataReady");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
+                            "ClientCallData::RecvInitialMetadataReady"));
   if (!error.ok()) {
     switch (recv_initial_metadata_->state) {
       case RecvInitialMetadata::kHookedWaitingForPipe:
@@ -1742,7 +1745,8 @@ void ClientCallData::RecvTrailingMetadataReadyCallback(
 }
 
 void ClientCallData::RecvTrailingMetadataReady(grpc_error_handle error) {
-  Flusher flusher(this, "ClientCallData::RecvTrailingMetadataReady");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
+                            "ClientCallData::RecvTrailingMetadataReady"));
   GRPC_TRACE_LOG(channel, INFO)
       << LogTag() << " ClientCallData.RecvTrailingMetadataReady "
       << "recv_trailing_state=" << StateString(recv_trailing_state_)
@@ -1798,7 +1802,7 @@ void ClientCallData::WakeInsideCombiner(Flusher* flusher) {
 }
 
 void ClientCallData::OnWakeup() {
-  Flusher flusher(this, "ClientCallData::OnWakeup");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ClientCallData::OnWakeup"));
   ScopedContext context(this);
   WakeInsideCombiner(&flusher);
 }
@@ -1875,7 +1879,8 @@ class ServerCallData::PollContext {
         auto* next_poll = static_cast<NextPoll*>(p);
         {
           Flusher flusher(next_poll->call_data,
-                          "ServerCallData::PollContext::~PollContext");
+                          GRPC_LATENT_SEE_METADATA(
+                              "ServerCallData::PollContext::~PollContext"));
           ScopedContext context(next_poll->call_data);
           next_poll->call_data->WakeInsideCombiner(&flusher);
         }
@@ -1979,7 +1984,7 @@ void ServerCallData::StartBatch(grpc_transport_stream_op_batch* b) {
   // Fake out the activity based context.
   ScopedContext context(this);
   CapturedBatch batch(b);
-  Flusher flusher(this, "ServerCallData::StartBatch");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ServerCallData::StartBatch"));
   bool wake = false;
 
   GRPC_TRACE_LOG(channel, INFO) << LogTag() << " StartBatch: " << DebugString();
@@ -2268,7 +2273,8 @@ void ServerCallData::RecvTrailingMetadataReady(grpc_error_handle error) {
   GRPC_TRACE_LOG(channel, INFO)
       << LogTag() << ": RecvTrailingMetadataReady error=" << error
       << " md=" << recv_trailing_metadata_->DebugString();
-  Flusher flusher(this, "ServerCallData::RecvTrailingMetadataReady");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
+                            "ServerCallData::RecvTrailingMetadataReady"));
   PollContext poll_ctx(this, &flusher);
   Completed(error, recv_trailing_metadata_->get(GrpcTarPit()).has_value(),
             &flusher);
@@ -2282,7 +2288,8 @@ void ServerCallData::RecvInitialMetadataReadyCallback(void* arg,
 }
 
 void ServerCallData::RecvInitialMetadataReady(grpc_error_handle error) {
-  Flusher flusher(this, "ServerCallData::RecvInitialMetadataReady");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA(
+                            "ServerCallData::RecvInitialMetadataReady"));
   GRPC_TRACE_LOG(channel, INFO)
       << LogTag() << ": RecvInitialMetadataReady " << error;
   CHECK(recv_initial_state_ == RecvInitialState::kForwarded);
@@ -2497,7 +2504,7 @@ void ServerCallData::WakeInsideCombiner(Flusher* flusher) {
 }
 
 void ServerCallData::OnWakeup() {
-  Flusher flusher(this, "ServerCallData::OnWakeup");
+  Flusher flusher(this, GRPC_LATENT_SEE_METADATA("ServerCallData::OnWakeup"));
   ScopedContext context(this);
   WakeInsideCombiner(&flusher);
 }
diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 979c9e7db95..1a31b901052 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -977,7 +977,8 @@ class BaseCallData : public Activity, private Wakeable {
   class Flusher : public latent_see::InnerScope {
    public:
     explicit Flusher(BaseCallData* call,
-                     const char* desc = "PromiseBasedFilter::Flusher");
+                     latent_see::Metadata* desc = GRPC_LATENT_SEE_METADATA(
+                         "PromiseBasedFilter::Flusher"));
     // Calls closures, schedules batches, relinquishes call combiner.
     ~Flusher();
 
diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h
index 19ca150b722..cf22a40ed8e 100644
--- a/src/core/util/latent_see.h
+++ b/src/core/util/latent_see.h
@@ -260,12 +260,6 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) {
                                                        #name};             \
     return &metadata;                                                      \
   }()
-#define GRPC_LATENT_SEE_METADATA_RAW(name)                                 \
-  [ptr = name]() {                                                         \
-    static grpc_core::latent_see::Metadata metadata = {__FILE__, __LINE__, \
-                                                       ptr};               \
-    return &metadata;                                                      \
-  }()
 // Parent scope: logs a begin and end event, and flushes the thread log on scope
 // exit. Because the flush takes some time it's better to place one parent scope
 // at the top of the stack, and use lighter weight scopes within it.

From 331d42140e1bb405d1f2c65244b9f516df71b623 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Sun, 29 Sep 2024 22:21:19 -0700
Subject: [PATCH 15/74] [chaotic-good] Fix use after free (#37814)

Closes #37814

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37814 from ctiller:flake-fightas-15 cab1017eb771442aa96452a1de061f48b2fa3349
PiperOrigin-RevId: 680418287
---
 src/core/server/server.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/server/server.cc b/src/core/server/server.cc
index 573cd66b224..f88eb5925da 100644
--- a/src/core/server/server.cc
+++ b/src/core/server/server.cc
@@ -869,8 +869,10 @@ auto Server::MatchAndPublishCall(CallHandler call_handler) {
 absl::StatusOr<RefCountedPtr<UnstartedCallDestination>>
 Server::MakeCallDestination(const ChannelArgs& args) {
   InterceptionChainBuilder builder(args);
-  builder.AddOnClientInitialMetadata(
-      [this](ClientMetadata& md) { SetRegisteredMethodOnMetadata(md); });
+  // TODO(ctiller): find a way to avoid adding a server ref per call
+  builder.AddOnClientInitialMetadata([self = Ref()](ClientMetadata& md) {
+    self->SetRegisteredMethodOnMetadata(md);
+  });
   CoreConfiguration::Get().channel_init().AddToInterceptionChainBuilder(
       GRPC_SERVER_CHANNEL, builder);
   return builder.Build(

From ff0c2e326f4ff0a5236be29d6be1094e1b3290e5 Mon Sep 17 00:00:00 2001
From: Tanvi Jagtap <tjagtap@google.com>
Date: Mon, 30 Sep 2024 04:29:43 -0700
Subject: [PATCH 16/74] [PH2][Refactor] Minor changes. 1. Rename
 write_state_name to get_state_name 2. Adding const where appropriate

PiperOrigin-RevId: 680516861
---
 .../chttp2/transport/chttp2_transport.cc      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index fef7fb92d0b..97cfe956ba9 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -441,7 +441,7 @@ grpc_chttp2_transport::~grpc_chttp2_transport() {
 
 static void read_channel_args(grpc_chttp2_transport* t,
                               const grpc_core::ChannelArgs& channel_args,
-                              bool is_client) {
+                              const bool is_client) {
   const int initial_sequence_number =
       channel_args.GetInt(GRPC_ARG_HTTP2_INITIAL_SEQUENCE_NUMBER).value_or(-1);
   if (initial_sequence_number > 0) {
@@ -611,7 +611,7 @@ using grpc_event_engine::experimental::TcpTraceExtension;
 
 grpc_chttp2_transport::grpc_chttp2_transport(
     const grpc_core::ChannelArgs& channel_args,
-    grpc_core::OrphanablePtr<grpc_endpoint> endpoint, bool is_client)
+    grpc_core::OrphanablePtr<grpc_endpoint> endpoint, const bool is_client)
     : ep(std::move(endpoint)),
       peer_string(
           grpc_core::Slice::FromCopiedString(grpc_endpoint_get_peer(ep.get()))),
@@ -935,7 +935,7 @@ grpc_chttp2_stream* grpc_chttp2_parsing_accept_stream(grpc_chttp2_transport* t,
 // OUTPUT PROCESSING
 //
 
-static const char* write_state_name(grpc_chttp2_write_state st) {
+static const char* get_write_state_name(grpc_chttp2_write_state st) {
   switch (st) {
     case GRPC_CHTTP2_WRITE_STATE_IDLE:
       return "IDLE";
@@ -952,8 +952,8 @@ static void set_write_state(grpc_chttp2_transport* t,
   GRPC_TRACE_LOG(http, INFO)
       << "W:" << t << " " << (t->is_client ? "CLIENT" : "SERVER") << " ["
       << t->peer_string.as_string_view() << "] state "
-      << write_state_name(t->write_state) << " -> " << write_state_name(st)
-      << " [" << reason << "]";
+      << get_write_state_name(t->write_state) << " -> "
+      << get_write_state_name(st) << " [" << reason << "]";
   t->write_state = st;
   // If the state is being reset back to idle, it means a write was just
   // finished. Make sure all the run_after_write closures are scheduled.
@@ -1315,7 +1315,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t,
       << " flags="
       << (closure->next_data.scratch % CLOSURE_BARRIER_FIRST_REF_BIT)
       << " desc=" << desc << " err=" << grpc_core::StatusToString(error)
-      << " write_state=" << write_state_name(t->write_state)
+      << " write_state=" << get_write_state_name(t->write_state)
       << " whence=" << whence.file() << ":" << whence.line();
 
   if (!error.ok()) {
@@ -1324,7 +1324,7 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t,
     if (cl_err.ok()) {
       cl_err = GRPC_ERROR_CREATE(absl::StrCat(
           "Error in HTTP transport completing operation: ", desc,
-          " write_state=", write_state_name(t->write_state),
+          " write_state=", get_write_state_name(t->write_state),
           " refs=", closure->next_data.scratch / CLOSURE_BARRIER_FIRST_REF_BIT,
           " flags=", closure->next_data.scratch % CLOSURE_BARRIER_FIRST_REF_BIT,
           " peer_address=", t->peer_string.as_string_view()));
@@ -1353,7 +1353,7 @@ static bool contains_non_ok_status(grpc_metadata_batch* batch) {
 }
 
 static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id,
-                         bool is_client, bool is_initial) {
+                         const bool is_client, const bool is_initial) {
   VLOG(2) << "--metadata--";
   const std::string prefix = absl::StrCat(
       "HTTP:", id, is_initial ? ":HDR" : ":TRL", is_client ? ":CLI:" : ":SVR:");
@@ -1936,7 +1936,7 @@ class GracefulGoaway : public grpc_core::RefCounted<GracefulGoaway> {
 }  // namespace
 
 static void send_goaway(grpc_chttp2_transport* t, grpc_error_handle error,
-                        bool immediate_disconnect_hint) {
+                        const bool immediate_disconnect_hint) {
   grpc_http2_error_code http_error;
   std::string message;
   grpc_error_get_status(error, grpc_core::Timestamp::InfFuture(), nullptr,
@@ -3262,7 +3262,7 @@ grpc_chttp2_transport_get_socket_node(grpc_core::Transport* transport) {
 
 grpc_core::Transport* grpc_create_chttp2_transport(
     const grpc_core::ChannelArgs& channel_args,
-    grpc_core::OrphanablePtr<grpc_endpoint> ep, bool is_client) {
+    grpc_core::OrphanablePtr<grpc_endpoint> ep, const bool is_client) {
   return new grpc_chttp2_transport(channel_args, std::move(ep), is_client);
 }
 

From a49d450a54c9116d107e921505f1d22efdaa6365 Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Mon, 30 Sep 2024 10:52:26 -0700
Subject: [PATCH 17/74] [Build] Bumped the minimum version of cmake (#37702)

Per https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md, the minimum version of cmake to support is 3.16 so let's change our cmake builds' requirements accordingly.

Closes #37702

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37702 from veblush:cmake316 bb4ed1a1be5e9374980c922aac3dc1ccd27d1266
PiperOrigin-RevId: 680639191
---
 CMakeLists.txt                                               | 2 +-
 examples/android/helloworld/app/CMakeLists.txt               | 2 +-
 examples/cpp/auth/CMakeLists.txt                             | 2 +-
 examples/cpp/cancellation/CMakeLists.txt                     | 2 +-
 examples/cpp/cmake/common.cmake                              | 2 +-
 examples/cpp/compression/CMakeLists.txt                      | 2 +-
 examples/cpp/deadline/CMakeLists.txt                         | 2 +-
 examples/cpp/error_details/CMakeLists.txt                    | 2 +-
 examples/cpp/error_handling/CMakeLists.txt                   | 2 +-
 examples/cpp/flow_control/CMakeLists.txt                     | 2 +-
 examples/cpp/generic_api/CMakeLists.txt                      | 2 +-
 examples/cpp/health/CMakeLists.txt                           | 2 +-
 examples/cpp/helloworld/CMakeLists.txt                       | 2 +-
 examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt | 2 +-
 examples/cpp/interceptors/CMakeLists.txt                     | 2 +-
 examples/cpp/keepalive/CMakeLists.txt                        | 2 +-
 examples/cpp/load_balancing/CMakeLists.txt                   | 2 +-
 examples/cpp/metadata/CMakeLists.txt                         | 2 +-
 examples/cpp/multiplex/CMakeLists.txt                        | 2 +-
 examples/cpp/otel/CMakeLists.txt                             | 2 +-
 examples/cpp/otel/codelab/CMakeLists.txt                     | 2 +-
 examples/cpp/otel/ostream/CMakeLists.txt                     | 2 +-
 examples/cpp/retry/CMakeLists.txt                            | 2 +-
 examples/cpp/route_guide/CMakeLists.txt                      | 2 +-
 examples/cpp/wait_for_ready/CMakeLists.txt                   | 2 +-
 src/android/test/interop/app/CMakeLists.txt                  | 2 +-
 src/cpp/README.md                                            | 2 +-
 templates/CMakeLists.txt.template                            | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index da1e9c4ae87..85b51d334d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@
 
 
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16)
 
 set(PACKAGE_NAME          "grpc")
 set(PACKAGE_VERSION       "1.68.0-dev")
diff --git a/examples/android/helloworld/app/CMakeLists.txt b/examples/android/helloworld/app/CMakeLists.txt
index 4524d3e0250..70c2d65668c 100644
--- a/examples/android/helloworld/app/CMakeLists.txt
+++ b/examples/android/helloworld/app/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 set(helloworld_PROTOBUF_PROTOC_EXECUTABLE "/usr/local/bin/protoc" CACHE STRING "Protoc binary on host")
 set(helloworld_GRPC_CPP_PLUGIN_EXECUTABLE "/usr/local/bin/grpc_cpp_plugin" CACHE STRING "gRPC CPP plugin binary on host")
diff --git a/examples/cpp/auth/CMakeLists.txt b/examples/cpp/auth/CMakeLists.txt
index 1f28ba6bcc8..c1a97cd9f65 100644
--- a/examples/cpp/auth/CMakeLists.txt
+++ b/examples/cpp/auth/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building keyvaluestore.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(Cancellation C CXX)
 
diff --git a/examples/cpp/cancellation/CMakeLists.txt b/examples/cpp/cancellation/CMakeLists.txt
index c82111b5239..e98472bba65 100644
--- a/examples/cpp/cancellation/CMakeLists.txt
+++ b/examples/cpp/cancellation/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building keyvaluestore.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(Cancellation C CXX)
 
diff --git a/examples/cpp/cmake/common.cmake b/examples/cpp/cmake/common.cmake
index df9bc4db0f8..9637a2ad26c 100644
--- a/examples/cpp/cmake/common.cmake
+++ b/examples/cpp/cmake/common.cmake
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building route_guide.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 if(MSVC)
   add_definitions(-D_WIN32_WINNT=0x600)
diff --git a/examples/cpp/compression/CMakeLists.txt b/examples/cpp/compression/CMakeLists.txt
index ca89acff47a..63cc4400ec4 100644
--- a/examples/cpp/compression/CMakeLists.txt
+++ b/examples/cpp/compression/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(Compression C CXX)
 
diff --git a/examples/cpp/deadline/CMakeLists.txt b/examples/cpp/deadline/CMakeLists.txt
index 1cf3462e31c..e0353f26df6 100644
--- a/examples/cpp/deadline/CMakeLists.txt
+++ b/examples/cpp/deadline/CMakeLists.txt
@@ -16,7 +16,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building this example.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(Deadline C CXX)
 
diff --git a/examples/cpp/error_details/CMakeLists.txt b/examples/cpp/error_details/CMakeLists.txt
index 3b32bc74900..36582ce67b8 100644
--- a/examples/cpp/error_details/CMakeLists.txt
+++ b/examples/cpp/error_details/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(ErrorDetails C CXX)
 
diff --git a/examples/cpp/error_handling/CMakeLists.txt b/examples/cpp/error_handling/CMakeLists.txt
index 1ae09cc8c5f..14b6414c502 100644
--- a/examples/cpp/error_handling/CMakeLists.txt
+++ b/examples/cpp/error_handling/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(ErrorHandling C CXX)
 
diff --git a/examples/cpp/flow_control/CMakeLists.txt b/examples/cpp/flow_control/CMakeLists.txt
index 0d6d4353177..48c7576220d 100644
--- a/examples/cpp/flow_control/CMakeLists.txt
+++ b/examples/cpp/flow_control/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building example.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(HelloWorld C CXX)
 
diff --git a/examples/cpp/generic_api/CMakeLists.txt b/examples/cpp/generic_api/CMakeLists.txt
index 44e3820f0ab..988e44ca4f3 100644
--- a/examples/cpp/generic_api/CMakeLists.txt
+++ b/examples/cpp/generic_api/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(GenericAPI C CXX)
 
diff --git a/examples/cpp/health/CMakeLists.txt b/examples/cpp/health/CMakeLists.txt
index 963e82f0a3e..fc19ddb9785 100644
--- a/examples/cpp/health/CMakeLists.txt
+++ b/examples/cpp/health/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(HelloWorld C CXX)
 
diff --git a/examples/cpp/helloworld/CMakeLists.txt b/examples/cpp/helloworld/CMakeLists.txt
index defe3064b14..23c7ccd9211 100644
--- a/examples/cpp/helloworld/CMakeLists.txt
+++ b/examples/cpp/helloworld/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(HelloWorld C CXX)
 
diff --git a/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt b/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt
index 8c1218a053d..e370cc48084 100644
--- a/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt
+++ b/examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt
@@ -20,7 +20,7 @@
 # including the "helloworld" project itself.
 # See https://blog.kitware.com/cmake-superbuilds-git-submodules/
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 # Project
 project(HelloWorld-SuperBuild C CXX)
diff --git a/examples/cpp/interceptors/CMakeLists.txt b/examples/cpp/interceptors/CMakeLists.txt
index 38b7c83c570..69c64fbe2cf 100644
--- a/examples/cpp/interceptors/CMakeLists.txt
+++ b/examples/cpp/interceptors/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building keyvaluestore.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(KeyValueStore C CXX)
 
diff --git a/examples/cpp/keepalive/CMakeLists.txt b/examples/cpp/keepalive/CMakeLists.txt
index 8053fba1df6..95bbaed5e6b 100644
--- a/examples/cpp/keepalive/CMakeLists.txt
+++ b/examples/cpp/keepalive/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(HelloWorld C CXX)
 
diff --git a/examples/cpp/load_balancing/CMakeLists.txt b/examples/cpp/load_balancing/CMakeLists.txt
index 786a508b272..73ea0c33968 100644
--- a/examples/cpp/load_balancing/CMakeLists.txt
+++ b/examples/cpp/load_balancing/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(LoadBalancing C CXX)
 
diff --git a/examples/cpp/metadata/CMakeLists.txt b/examples/cpp/metadata/CMakeLists.txt
index 7a95323b16a..36cacacd4f2 100644
--- a/examples/cpp/metadata/CMakeLists.txt
+++ b/examples/cpp/metadata/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(Metadata C CXX)
 
diff --git a/examples/cpp/multiplex/CMakeLists.txt b/examples/cpp/multiplex/CMakeLists.txt
index d0b97a37f26..185e79a3965 100644
--- a/examples/cpp/multiplex/CMakeLists.txt
+++ b/examples/cpp/multiplex/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(Multiplex C CXX)
 
diff --git a/examples/cpp/otel/CMakeLists.txt b/examples/cpp/otel/CMakeLists.txt
index b81a2538a89..3718b5c8ae3 100644
--- a/examples/cpp/otel/CMakeLists.txt
+++ b/examples/cpp/otel/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16)
 
 project(grpc_opentelemetry_example C CXX)
 
diff --git a/examples/cpp/otel/codelab/CMakeLists.txt b/examples/cpp/otel/codelab/CMakeLists.txt
index 6ce38d77a2f..9403822c2b7 100644
--- a/examples/cpp/otel/codelab/CMakeLists.txt
+++ b/examples/cpp/otel/codelab/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16)
 
 project(grpc_opentelemetry_example C CXX)
 
diff --git a/examples/cpp/otel/ostream/CMakeLists.txt b/examples/cpp/otel/ostream/CMakeLists.txt
index c0d9a58a988..9b37a5d19f8 100644
--- a/examples/cpp/otel/ostream/CMakeLists.txt
+++ b/examples/cpp/otel/ostream/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16)
 
 project(grpc_opentelemetry_example C CXX)
 
diff --git a/examples/cpp/retry/CMakeLists.txt b/examples/cpp/retry/CMakeLists.txt
index f01e360bb7a..b07149a2cf6 100644
--- a/examples/cpp/retry/CMakeLists.txt
+++ b/examples/cpp/retry/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building retry.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(Retry C CXX)
 
diff --git a/examples/cpp/route_guide/CMakeLists.txt b/examples/cpp/route_guide/CMakeLists.txt
index 90cebda39b1..bc321a00d57 100644
--- a/examples/cpp/route_guide/CMakeLists.txt
+++ b/examples/cpp/route_guide/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building route_guide.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(RouteGuide C CXX)
 
diff --git a/examples/cpp/wait_for_ready/CMakeLists.txt b/examples/cpp/wait_for_ready/CMakeLists.txt
index 06024dfbc9b..472ece2d651 100644
--- a/examples/cpp/wait_for_ready/CMakeLists.txt
+++ b/examples/cpp/wait_for_ready/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See cmake_externalproject/CMakeLists.txt for all-in-one cmake build
 # that automatically builds all the dependencies before building helloworld.
 
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 project(HelloWorld C CXX)
 
diff --git a/src/android/test/interop/app/CMakeLists.txt b/src/android/test/interop/app/CMakeLists.txt
index 403f1e518d8..83444593191 100644
--- a/src/android/test/interop/app/CMakeLists.txt
+++ b/src/android/test/interop/app/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.16)
 
 set(PROTOBUF_PROTOC_EXECUTABLE "/usr/local/bin/protoc" CACHE STRING "Protoc binary on host")
 set(gRPC_CPP_PLUGIN_EXECUTABLE "/usr/local/bin/grpc_cpp_plugin" CACHE STRING "gRPC CPP plugin binary on host")
diff --git a/src/cpp/README.md b/src/cpp/README.md
index 780528b9c5e..84c19b79187 100755
--- a/src/cpp/README.md
+++ b/src/cpp/README.md
@@ -107,7 +107,7 @@ also sets up an `add_subdirectory()` rule for you. This causes gRPC to be
 built as part of your project.
 
 ```cmake
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.16)
 project(my_project)
 
 include(FetchContent)
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index a3e7503f373..f5b7480d639 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -275,7 +275,7 @@
         protobuf_gen_files.add(src)
   %>
 
-  cmake_minimum_required(VERSION 3.13)
+  cmake_minimum_required(VERSION 3.16)
 
   set(PACKAGE_NAME          "grpc")
   set(PACKAGE_VERSION       "${settings.cpp_version}")

From daa793860c4a601533d538582c97da878b7d5824 Mon Sep 17 00:00:00 2001
From: Esun Kim <veblush@google.com>
Date: Mon, 30 Sep 2024 12:48:13 -0700
Subject: [PATCH 18/74] [Build] Minimum version of MSVC is now 2022 (#37687)

Per https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md, we can require msvc 2022 or later.

Closes #37687

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37687 from veblush:msvc2022 32e35ec5b57697b2ab7341952df672eb37557038
PiperOrigin-RevId: 680682655
---
 BUILDING.md                                          |  6 +++---
 src/cpp/README.md                                    |  2 +-
 test/distrib/cpp/run_distrib_test_cmake.bat          |  2 +-
 .../run_distrib_test_cmake_as_externalproject.bat    |  2 +-
 test/distrib/cpp/run_distrib_test_cmake_for_dll.bat  |  2 +-
 tools/run_tests/run_tests.py                         | 12 +-----------
 tools/run_tests/run_tests_matrix.py                  |  2 +-
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index a293335b50e..8af2ba8478b 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -55,7 +55,7 @@ installed by `brew` is being used:
 ## Windows
 
 To prepare for cmake + Microsoft Visual C++ compiler build
-- Install Visual Studio 2019 or later (Visual C++ compiler will be used).
+- Install Visual Studio 2022 or later (Visual C++ compiler will be used).
 - Install [Git](https://git-scm.com/).
 - Install [CMake](https://cmake.org/download/).
 - Install [nasm](https://www.nasm.us/) and add it to `PATH` (`choco install nasm`) - *required by boringssl*
@@ -132,7 +132,7 @@ $ make
 
 If you want to build shared libraries (`.so` files), run `cmake` with `-DBUILD_SHARED_LIBS=ON`.
 
-### Windows, Using Visual Studio 2019 or later
+### Windows, Using Visual Studio 2022 or later
 
 When using the "Visual Studio" generator,
 cmake will generate a solution (`grpc.sln`) that contains a VS project for
@@ -143,7 +143,7 @@ you will be able to browse and build the code.
 > @rem Run from grpc directory after cloning the repo with --recursive or updating submodules.
 > md .build
 > cd .build
-> cmake .. -G "Visual Studio 16 2019"
+> cmake .. -G "Visual Studio 17 2022"
 > cmake --build . --config Release
 ```
 
diff --git a/src/cpp/README.md b/src/cpp/README.md
index 84c19b79187..a999068fb75 100755
--- a/src/cpp/README.md
+++ b/src/cpp/README.md
@@ -31,7 +31,7 @@ Therefore, gRPC supports several major build systems, which should satisfy most
 | Operating System | Architectures | Versions | Support Level |
 |------------------|---------------|----------|---------------|
 | Linux - Debian, Ubuntu, CentOS | x86, x64      | clang 7+, GCC 7.3+     | Officially Supported |
-| Windows 10+                    | x86, x64      | Visual Studio 2019+    | Officially Supported |
+| Windows 10+                    | x86, x64      | Visual Studio 2022+    | Officially Supported |
 | MacOS                          | x64, ARM64    | XCode 12+              | Officially Supported |
 | Linux - Others                 | x86, x64      | clang 7+, GCC 7.3+     | Best Effort          |
 | Linux                          | ARM64         |                        | Best Effort          |
diff --git a/test/distrib/cpp/run_distrib_test_cmake.bat b/test/distrib/cpp/run_distrib_test_cmake.bat
index 7a485e4da51..ec8828e1fd7 100644
--- a/test/distrib/cpp/run_distrib_test_cmake.bat
+++ b/test/distrib/cpp/run_distrib_test_cmake.bat
@@ -31,7 +31,7 @@ set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32
 
 @rem TODO(jtattermusch): add support for GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS env variable
 
-set VS_GENERATOR="Visual Studio 16 2019"
+set VS_GENERATOR="Visual Studio 17 2022"
 @rem TODO(jtattermusch): switch to x64 build (will require pulling a x64 build of openssl)
 set VS_ARCHITECTURE="Win32"
 
diff --git a/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat b/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat
index a55fca355a3..cdc987da2c0 100644
--- a/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat
+++ b/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.bat
@@ -28,7 +28,7 @@ set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32
 
 @rem TODO(jtattermusch): add support for GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS env variable
 
-set VS_GENERATOR="Visual Studio 16 2019"
+set VS_GENERATOR="Visual Studio 17 2022"
 @rem TODO(jtattermusch): switch to x64 build (will require pulling a x64 build of openssl)
 set VS_ARCHITECTURE="Win32"
 
diff --git a/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat b/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
index 887c20dcd74..e4676c018a8 100644
--- a/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
+++ b/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
@@ -31,7 +31,7 @@ set OPENSSL_DIR=%cd:\=/%/OpenSSL-Win32
 
 @rem TODO(jtattermusch): add support for GRPC_CPP_DISTRIBTEST_BUILD_COMPILER_JOBS env variable
 
-set VS_GENERATOR="Visual Studio 16 2019"
+set VS_GENERATOR="Visual Studio 17 2022"
 @rem TODO(jtattermusch): switch to x64 build (will require pulling a x64 build of openssl)
 set VS_ARCHITECTURE="Win32"
 
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 90073bb8e2c..c4d7ddcb892 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -283,9 +283,7 @@ class CLanguage(object):
                 [
                     "default",
                     "cmake",
-                    "cmake_ninja_vs2019",
                     "cmake_ninja_vs2022",
-                    "cmake_vs2019",
                     "cmake_vs2022",
                 ],
             )
@@ -293,19 +291,13 @@ class CLanguage(object):
 
             activate_vs_tools = ""
             if (
-                self.args.compiler == "cmake_ninja_vs2019"
+                self.args.compiler == "cmake_ninja_vs2022"
                 or self.args.compiler == "cmake"
                 or self.args.compiler == "default"
             ):
                 # cmake + ninja build is the default because it is faster and supports boringssl assembly optimizations
-                # the compiler used is exactly the same as for cmake_vs2017
-                cmake_generator = "Ninja"
-                activate_vs_tools = "2019"
-            elif self.args.compiler == "cmake_ninja_vs2022":
                 cmake_generator = "Ninja"
                 activate_vs_tools = "2022"
-            elif self.args.compiler == "cmake_vs2019":
-                cmake_generator = "Visual Studio 16 2019"
             elif self.args.compiler == "cmake_vs2022":
                 cmake_generator = "Visual Studio 17 2022"
             else:
@@ -1698,9 +1690,7 @@ argp.add_argument(
         "all_the_cpythons",
         "coreclr",
         "cmake",
-        "cmake_ninja_vs2019",
         "cmake_ninja_vs2022",
-        "cmake_vs2019",
         "cmake_vs2022",
         "mono",
     ],
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 4058cc5261d..3b9f2238248 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -383,7 +383,7 @@ def _create_portability_test_jobs(
         configs=["dbg"],
         platforms=["windows"],
         arch="default",
-        compiler="cmake_ninja_vs2019",
+        compiler="cmake_ninja_vs2022",
         labels=["portability", "corelang"],
         extra_args=extra_args,
         inner_jobs=inner_jobs,

From 80b57c909b7bd4f7b459e62e441ebed027d68a6d Mon Sep 17 00:00:00 2001
From: Yijie Ma <yijiem@google.com>
Date: Mon, 30 Sep 2024 15:09:05 -0700
Subject: [PATCH 19/74] [call_creds_util] Add debug checks for metadata
 accesses (#37822)

Fix https://github.com/grpc/grpc/issues/37701

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37822

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37822 from yijiem:debug-check-metadata 67df0da89c6a9be19a6ac3feb9dece436cfe9453
PiperOrigin-RevId: 680734161
---
 src/core/lib/security/credentials/call_creds_util.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc
index 71c3da6dfa3..3acc0708f62 100644
--- a/src/core/lib/security/credentials/call_creds_util.cc
+++ b/src/core/lib/security/credentials/call_creds_util.cc
@@ -18,6 +18,7 @@
 
 #include <string.h>
 
+#include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
@@ -42,6 +43,7 @@ struct ServiceUrlAndMethod {
 ServiceUrlAndMethod MakeServiceUrlAndMethod(
     const ClientMetadataHandle& initial_metadata,
     const grpc_call_credentials::GetRequestMetadataArgs* args) {
+  DCHECK(initial_metadata->get_pointer(HttpPathMetadata()) != nullptr);
   auto service =
       initial_metadata->get_pointer(HttpPathMetadata())->as_string_view();
   auto last_slash = service.find_last_of('/');
@@ -56,6 +58,7 @@ ServiceUrlAndMethod MakeServiceUrlAndMethod(
     method_name = service.substr(last_slash + 1);
     service = service.substr(0, last_slash);
   }
+  DCHECK(initial_metadata->get_pointer(HttpAuthorityMetadata()) != nullptr);
   auto host_and_port =
       initial_metadata->get_pointer(HttpAuthorityMetadata())->as_string_view();
   absl::string_view url_scheme = args->security_connector->url_scheme();

From 229de2530b9f0b5dee660942cef2333e20cd747d Mon Sep 17 00:00:00 2001
From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com>
Date: Mon, 30 Sep 2024 22:31:47 -0700
Subject: [PATCH 20/74] [PH2][Refactor] Creating call_tracer_wrapper.h . 
 (#37786)

[PH2][Refactor] Creating call_tracer_wrapper.h and cc and moving code as-is into it. The content of the functions or classes has not changed.
In the next few iterations, more code will come into this file.

Closes #37786

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37786 from tanvi-jagtap:ph2_internal_h_split_01 31af14a4e76eb67fadab37d5e5522b4637b5b511
PiperOrigin-RevId: 680861154
---
 BUILD                                         |  2 +
 CMakeLists.txt                                |  2 +
 Makefile                                      |  1 +
 Package.swift                                 |  2 +
 build_autogenerated.yaml                      |  4 ++
 config.m4                                     |  1 +
 config.w32                                    |  1 +
 gRPC-C++.podspec                              |  2 +
 gRPC-Core.podspec                             |  3 +
 grpc.gemspec                                  |  2 +
 package.xml                                   |  2 +
 .../chttp2/transport/call_tracer_wrapper.cc   | 53 ++++++++++++++
 .../chttp2/transport/call_tracer_wrapper.h    | 72 +++++++++++++++++++
 .../chttp2/transport/chttp2_transport.cc      | 29 +-------
 .../transport/chttp2/transport/frame_data.cc  |  1 +
 .../chttp2/transport/frame_rst_stream.cc      |  1 +
 .../chttp2/transport/frame_window_update.cc   |  1 +
 .../ext/transport/chttp2/transport/internal.h | 46 +-----------
 .../ext/transport/chttp2/transport/parsing.cc |  1 +
 .../ext/transport/chttp2/transport/writing.cc |  1 +
 src/python/grpcio/grpc_core_dependencies.py   |  1 +
 tools/doxygen/Doxyfile.c++.internal           |  2 +
 tools/doxygen/Doxyfile.core.internal          |  2 +
 23 files changed, 159 insertions(+), 73 deletions(-)
 create mode 100644 src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc
 create mode 100644 src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h

diff --git a/BUILD b/BUILD
index 0a0a13ee091..51633565bb3 100644
--- a/BUILD
+++ b/BUILD
@@ -4763,6 +4763,7 @@ grpc_cc_library(
     name = "grpc_transport_chttp2",
     srcs = [
         "//src/core:ext/transport/chttp2/transport/bin_decoder.cc",
+        "//src/core:ext/transport/chttp2/transport/call_tracer_wrapper.cc",
         "//src/core:ext/transport/chttp2/transport/chttp2_transport.cc",
         "//src/core:ext/transport/chttp2/transport/frame_data.cc",
         "//src/core:ext/transport/chttp2/transport/frame_goaway.cc",
@@ -4776,6 +4777,7 @@ grpc_cc_library(
     ],
     hdrs = [
         "//src/core:ext/transport/chttp2/transport/bin_decoder.h",
+        "//src/core:ext/transport/chttp2/transport/call_tracer_wrapper.h",
         "//src/core:ext/transport/chttp2/transport/chttp2_transport.h",
         "//src/core:ext/transport/chttp2/transport/frame_data.h",
         "//src/core:ext/transport/chttp2/transport/frame_goaway.h",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85b51d334d2..99147ab3f31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1907,6 +1907,7 @@ add_library(grpc
   src/core/ext/transport/chttp2/server/chttp2_server.cc
   src/core/ext/transport/chttp2/transport/bin_decoder.cc
   src/core/ext/transport/chttp2/transport/bin_encoder.cc
+  src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc
   src/core/ext/transport/chttp2/transport/chttp2_transport.cc
   src/core/ext/transport/chttp2/transport/decode_huff.cc
   src/core/ext/transport/chttp2/transport/flow_control.cc
@@ -3015,6 +3016,7 @@ add_library(grpc_unsecure
   src/core/ext/transport/chttp2/server/chttp2_server.cc
   src/core/ext/transport/chttp2/transport/bin_decoder.cc
   src/core/ext/transport/chttp2/transport/bin_encoder.cc
+  src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc
   src/core/ext/transport/chttp2/transport/chttp2_transport.cc
   src/core/ext/transport/chttp2/transport/decode_huff.cc
   src/core/ext/transport/chttp2/transport/flow_control.cc
diff --git a/Makefile b/Makefile
index 028c9f90090..b33a29370b9 100644
--- a/Makefile
+++ b/Makefile
@@ -711,6 +711,7 @@ LIBGRPC_SRC = \
     src/core/ext/transport/chttp2/server/chttp2_server.cc \
     src/core/ext/transport/chttp2/transport/bin_decoder.cc \
     src/core/ext/transport/chttp2/transport/bin_encoder.cc \
+    src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \
     src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
     src/core/ext/transport/chttp2/transport/decode_huff.cc \
     src/core/ext/transport/chttp2/transport/flow_control.cc \
diff --git a/Package.swift b/Package.swift
index c21dedc5f8b..f1e60c511ca 100644
--- a/Package.swift
+++ b/Package.swift
@@ -210,6 +210,8 @@ let package = Package(
         "src/core/ext/transport/chttp2/transport/bin_decoder.h",
         "src/core/ext/transport/chttp2/transport/bin_encoder.cc",
         "src/core/ext/transport/chttp2/transport/bin_encoder.h",
+        "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc",
+        "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h",
         "src/core/ext/transport/chttp2/transport/chttp2_transport.cc",
         "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
         "src/core/ext/transport/chttp2/transport/context_list_entry.h",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index b45eb26192f..1dd0e4f335f 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -267,6 +267,7 @@ libs:
   - src/core/ext/transport/chttp2/server/chttp2_server.h
   - src/core/ext/transport/chttp2/transport/bin_decoder.h
   - src/core/ext/transport/chttp2/transport/bin_encoder.h
+  - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h
   - src/core/ext/transport/chttp2/transport/chttp2_transport.h
   - src/core/ext/transport/chttp2/transport/context_list_entry.h
   - src/core/ext/transport/chttp2/transport/decode_huff.h
@@ -1317,6 +1318,7 @@ libs:
   - src/core/ext/transport/chttp2/server/chttp2_server.cc
   - src/core/ext/transport/chttp2/transport/bin_decoder.cc
   - src/core/ext/transport/chttp2/transport/bin_encoder.cc
+  - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc
   - src/core/ext/transport/chttp2/transport/chttp2_transport.cc
   - src/core/ext/transport/chttp2/transport/decode_huff.cc
   - src/core/ext/transport/chttp2/transport/flow_control.cc
@@ -2294,6 +2296,7 @@ libs:
   - src/core/ext/transport/chttp2/server/chttp2_server.h
   - src/core/ext/transport/chttp2/transport/bin_decoder.h
   - src/core/ext/transport/chttp2/transport/bin_encoder.h
+  - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h
   - src/core/ext/transport/chttp2/transport/chttp2_transport.h
   - src/core/ext/transport/chttp2/transport/context_list_entry.h
   - src/core/ext/transport/chttp2/transport/decode_huff.h
@@ -2776,6 +2779,7 @@ libs:
   - src/core/ext/transport/chttp2/server/chttp2_server.cc
   - src/core/ext/transport/chttp2/transport/bin_decoder.cc
   - src/core/ext/transport/chttp2/transport/bin_encoder.cc
+  - src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc
   - src/core/ext/transport/chttp2/transport/chttp2_transport.cc
   - src/core/ext/transport/chttp2/transport/decode_huff.cc
   - src/core/ext/transport/chttp2/transport/flow_control.cc
diff --git a/config.m4 b/config.m4
index 9bc1a068f3f..cd9212d3572 100644
--- a/config.m4
+++ b/config.m4
@@ -86,6 +86,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/transport/chttp2/server/chttp2_server.cc \
     src/core/ext/transport/chttp2/transport/bin_decoder.cc \
     src/core/ext/transport/chttp2/transport/bin_encoder.cc \
+    src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \
     src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
     src/core/ext/transport/chttp2/transport/decode_huff.cc \
     src/core/ext/transport/chttp2/transport/flow_control.cc \
diff --git a/config.w32 b/config.w32
index f1f0df73b81..b590018a1bd 100644
--- a/config.w32
+++ b/config.w32
@@ -51,6 +51,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\ext\\transport\\chttp2\\server\\chttp2_server.cc " +
     "src\\core\\ext\\transport\\chttp2\\transport\\bin_decoder.cc " +
     "src\\core\\ext\\transport\\chttp2\\transport\\bin_encoder.cc " +
+    "src\\core\\ext\\transport\\chttp2\\transport\\call_tracer_wrapper.cc " +
     "src\\core\\ext\\transport\\chttp2\\transport\\chttp2_transport.cc " +
     "src\\core\\ext\\transport\\chttp2\\transport\\decode_huff.cc " +
     "src\\core\\ext\\transport\\chttp2\\transport\\flow_control.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index abca293e113..aeb929b9ad6 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -356,6 +356,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/chttp2/server/chttp2_server.h',
                       'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                       'src/core/ext/transport/chttp2/transport/bin_encoder.h',
+                      'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h',
                       'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
                       'src/core/ext/transport/chttp2/transport/context_list_entry.h',
                       'src/core/ext/transport/chttp2/transport/decode_huff.h',
@@ -1660,6 +1661,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/transport/chttp2/server/chttp2_server.h',
                               'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                               'src/core/ext/transport/chttp2/transport/bin_encoder.h',
+                              'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h',
                               'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
                               'src/core/ext/transport/chttp2/transport/context_list_entry.h',
                               'src/core/ext/transport/chttp2/transport/decode_huff.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 48543720dee..26ed8c8dfab 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -330,6 +330,8 @@ Pod::Spec.new do |s|
                       'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                       'src/core/ext/transport/chttp2/transport/bin_encoder.cc',
                       'src/core/ext/transport/chttp2/transport/bin_encoder.h',
+                      'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc',
+                      'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h',
                       'src/core/ext/transport/chttp2/transport/chttp2_transport.cc',
                       'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
                       'src/core/ext/transport/chttp2/transport/context_list_entry.h',
@@ -2448,6 +2450,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/transport/chttp2/server/chttp2_server.h',
                               'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                               'src/core/ext/transport/chttp2/transport/bin_encoder.h',
+                              'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h',
                               'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
                               'src/core/ext/transport/chttp2/transport/context_list_entry.h',
                               'src/core/ext/transport/chttp2/transport/decode_huff.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 7c4645fc5d2..349abdf9586 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -216,6 +216,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/transport/chttp2/transport/bin_decoder.h )
   s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.cc )
   s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.h )
+  s.files += %w( src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc )
+  s.files += %w( src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h )
   s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.cc )
   s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.h )
   s.files += %w( src/core/ext/transport/chttp2/transport/context_list_entry.h )
diff --git a/package.xml b/package.xml
index 69833761539..3add46c2e40 100644
--- a/package.xml
+++ b/package.xml
@@ -198,6 +198,8 @@
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_decoder.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_encoder.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/bin_encoder.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/chttp2_transport.cc" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/chttp2_transport.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/context_list_entry.h" role="src" />
diff --git a/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc
new file mode 100644
index 00000000000..476f7844cd1
--- /dev/null
+++ b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc
@@ -0,0 +1,53 @@
+//
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
+
+#include "src/core/ext/transport/chttp2/transport/internal.h"
+
+namespace grpc_core {
+
+void Chttp2CallTracerWrapper::RecordIncomingBytes(
+    const CallTracerInterface::TransportByteSize& transport_byte_size) {
+  // Update legacy API.
+  stream_->stats.incoming.framing_bytes += transport_byte_size.framing_bytes;
+  stream_->stats.incoming.data_bytes += transport_byte_size.data_bytes;
+  stream_->stats.incoming.header_bytes += transport_byte_size.header_bytes;
+  // Update new API.
+  if (!IsCallTracerInTransportEnabled()) return;
+  auto* call_tracer = stream_->arena->GetContext<CallTracerInterface>();
+  if (call_tracer != nullptr) {
+    call_tracer->RecordIncomingBytes(transport_byte_size);
+  }
+}
+
+void Chttp2CallTracerWrapper::RecordOutgoingBytes(
+    const CallTracerInterface::TransportByteSize& transport_byte_size) {
+  // Update legacy API.
+  stream_->stats.outgoing.framing_bytes += transport_byte_size.framing_bytes;
+  stream_->stats.outgoing.data_bytes += transport_byte_size.data_bytes;
+  stream_->stats.outgoing.header_bytes +=
+      transport_byte_size.header_bytes;  // Update new API.
+  if (!IsCallTracerInTransportEnabled()) return;
+  auto* call_tracer = stream_->arena->GetContext<CallTracerInterface>();
+  if (call_tracer != nullptr) {
+    call_tracer->RecordOutgoingBytes(transport_byte_size);
+  }
+}
+
+}  // namespace grpc_core
\ No newline at end of file
diff --git a/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h
new file mode 100644
index 00000000000..cf535afc6cd
--- /dev/null
+++ b/src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h
@@ -0,0 +1,72 @@
+//
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CALL_TRACER_WRAPPER_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CALL_TRACER_WRAPPER_H
+
+#include "src/core/lib/transport/transport.h"
+#include "src/core/telemetry/call_tracer.h"
+
+struct grpc_chttp2_stream;
+
+namespace grpc_core {
+
+// A CallTracer wrapper that updates both the legacy and new APIs for
+// transport byte sizes.
+// TODO(ctiller): This can go away as part of removing the
+// grpc_transport_stream_stats struct.
+class Chttp2CallTracerWrapper final : public CallTracerInterface {
+ public:
+  explicit Chttp2CallTracerWrapper(grpc_chttp2_stream* stream)
+      : stream_(stream) {}
+
+  void RecordIncomingBytes(
+      const TransportByteSize& transport_byte_size) override;
+  void RecordOutgoingBytes(
+      const TransportByteSize& transport_byte_size) override;
+
+  // Everything else is a no-op.
+  void RecordSendInitialMetadata(
+      grpc_metadata_batch* /*send_initial_metadata*/) override {}
+  void RecordSendTrailingMetadata(
+      grpc_metadata_batch* /*send_trailing_metadata*/) override {}
+  void RecordSendMessage(const SliceBuffer& /*send_message*/) override {}
+  void RecordSendCompressedMessage(
+      const SliceBuffer& /*send_compressed_message*/) override {}
+  void RecordReceivedInitialMetadata(
+      grpc_metadata_batch* /*recv_initial_metadata*/) override {}
+  void RecordReceivedMessage(const SliceBuffer& /*recv_message*/) override {}
+  void RecordReceivedDecompressedMessage(
+      const SliceBuffer& /*recv_decompressed_message*/) override {}
+  void RecordCancel(grpc_error_handle /*cancel_error*/) override {}
+  std::shared_ptr<TcpTracerInterface> StartNewTcpTrace() override {
+    return nullptr;
+  }
+  void RecordAnnotation(absl::string_view /*annotation*/) override {}
+  void RecordAnnotation(const Annotation& /*annotation*/) override {}
+  std::string TraceId() override { return ""; }
+  std::string SpanId() override { return ""; }
+  bool IsSampled() override { return false; }
+
+ private:
+  grpc_chttp2_stream* stream_;
+};
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CALL_TRACER_WRAPPER_H
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 97cfe956ba9..e4b0b1fdf25 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -56,6 +56,7 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/frame_data.h"
@@ -361,34 +362,6 @@ std::string HttpAnnotation::ToString() const {
   return s;
 }
 
-void Chttp2CallTracerWrapper::RecordIncomingBytes(
-    const CallTracerInterface::TransportByteSize& transport_byte_size) {
-  // Update legacy API.
-  stream_->stats.incoming.framing_bytes += transport_byte_size.framing_bytes;
-  stream_->stats.incoming.data_bytes += transport_byte_size.data_bytes;
-  stream_->stats.incoming.header_bytes += transport_byte_size.header_bytes;
-  // Update new API.
-  if (!IsCallTracerInTransportEnabled()) return;
-  auto* call_tracer = stream_->arena->GetContext<CallTracerInterface>();
-  if (call_tracer != nullptr) {
-    call_tracer->RecordIncomingBytes(transport_byte_size);
-  }
-}
-
-void Chttp2CallTracerWrapper::RecordOutgoingBytes(
-    const CallTracerInterface::TransportByteSize& transport_byte_size) {
-  // Update legacy API.
-  stream_->stats.outgoing.framing_bytes += transport_byte_size.framing_bytes;
-  stream_->stats.outgoing.data_bytes += transport_byte_size.data_bytes;
-  stream_->stats.outgoing.header_bytes +=
-      transport_byte_size.header_bytes;  // Update new API.
-  if (!IsCallTracerInTransportEnabled()) return;
-  auto* call_tracer = stream_->arena->GetContext<CallTracerInterface>();
-  if (call_tracer != nullptr) {
-    call_tracer->RecordOutgoingBytes(transport_byte_size);
-  }
-}
-
 }  // namespace grpc_core
 
 //
diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc
index b20f1630add..b5bd13d2fc0 100644
--- a/src/core/ext/transport/chttp2/transport/frame_data.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_data.cc
@@ -27,6 +27,7 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
index 14d91329eae..0e38b36c05c 100644
--- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
@@ -30,6 +30,7 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
index 20cddebd5ca..5209ab2899a 100644
--- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
@@ -27,6 +27,7 @@
 
 #include <grpc/support/port_platform.h>
 
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/stream_lists.h"
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index bdbbd6890c7..76deea4f043 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -41,6 +41,7 @@
 #include <grpc/support/time.h>
 
 #include "src/core/channelz/channelz.h"
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
@@ -553,51 +554,6 @@ typedef enum {
   GRPC_METADATA_PUBLISHED_AT_CLOSE
 } grpc_published_metadata_method;
 
-namespace grpc_core {
-
-// A CallTracer wrapper that updates both the legacy and new APIs for
-// transport byte sizes.
-// TODO(ctiller): This can go away as part of removing the
-// grpc_transport_stream_stats struct.
-class Chttp2CallTracerWrapper final : public CallTracerInterface {
- public:
-  explicit Chttp2CallTracerWrapper(grpc_chttp2_stream* stream)
-      : stream_(stream) {}
-
-  void RecordIncomingBytes(
-      const TransportByteSize& transport_byte_size) override;
-  void RecordOutgoingBytes(
-      const TransportByteSize& transport_byte_size) override;
-
-  // Everything else is a no-op.
-  void RecordSendInitialMetadata(
-      grpc_metadata_batch* /*send_initial_metadata*/) override {}
-  void RecordSendTrailingMetadata(
-      grpc_metadata_batch* /*send_trailing_metadata*/) override {}
-  void RecordSendMessage(const SliceBuffer& /*send_message*/) override {}
-  void RecordSendCompressedMessage(
-      const SliceBuffer& /*send_compressed_message*/) override {}
-  void RecordReceivedInitialMetadata(
-      grpc_metadata_batch* /*recv_initial_metadata*/) override {}
-  void RecordReceivedMessage(const SliceBuffer& /*recv_message*/) override {}
-  void RecordReceivedDecompressedMessage(
-      const SliceBuffer& /*recv_decompressed_message*/) override {}
-  void RecordCancel(grpc_error_handle /*cancel_error*/) override {}
-  std::shared_ptr<TcpTracerInterface> StartNewTcpTrace() override {
-    return nullptr;
-  }
-  void RecordAnnotation(absl::string_view /*annotation*/) override {}
-  void RecordAnnotation(const Annotation& /*annotation*/) override {}
-  std::string TraceId() override { return ""; }
-  std::string SpanId() override { return ""; }
-  bool IsSampled() override { return false; }
-
- private:
-  grpc_chttp2_stream* stream_;
-};
-
-}  // namespace grpc_core
-
 struct grpc_chttp2_stream {
   grpc_chttp2_stream(grpc_chttp2_transport* t, grpc_stream_refcount* refcount,
                      const void* server_data, grpc_core::Arena* arena);
diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc
index cd102ff85df..e9d746d8e24 100644
--- a/src/core/ext/transport/chttp2/transport/parsing.cc
+++ b/src/core/ext/transport/chttp2/transport/parsing.cc
@@ -43,6 +43,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/channelz/channelz.h"
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/frame_data.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc
index d5678956f51..583d9eaa03d 100644
--- a/src/core/ext/transport/chttp2/transport/writing.cc
+++ b/src/core/ext/transport/chttp2/transport/writing.cc
@@ -37,6 +37,7 @@
 #include <grpc/support/time.h>
 
 #include "src/core/channelz/channelz.h"
+#include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index fde998c3af6..e1bbd06531f 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -60,6 +60,7 @@ CORE_SOURCE_FILES = [
     'src/core/ext/transport/chttp2/server/chttp2_server.cc',
     'src/core/ext/transport/chttp2/transport/bin_decoder.cc',
     'src/core/ext/transport/chttp2/transport/bin_encoder.cc',
+    'src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc',
     'src/core/ext/transport/chttp2/transport/chttp2_transport.cc',
     'src/core/ext/transport/chttp2/transport/decode_huff.cc',
     'src/core/ext/transport/chttp2/transport/flow_control.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index efef382f359..4147fafc791 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1221,6 +1221,8 @@ src/core/ext/transport/chttp2/transport/bin_decoder.cc \
 src/core/ext/transport/chttp2/transport/bin_decoder.h \
 src/core/ext/transport/chttp2/transport/bin_encoder.cc \
 src/core/ext/transport/chttp2/transport/bin_encoder.h \
+src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \
+src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h \
 src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
 src/core/ext/transport/chttp2/transport/chttp2_transport.h \
 src/core/ext/transport/chttp2/transport/context_list_entry.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 0471de0c886..cf962517d9e 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -988,6 +988,8 @@ src/core/ext/transport/chttp2/transport/bin_decoder.cc \
 src/core/ext/transport/chttp2/transport/bin_decoder.h \
 src/core/ext/transport/chttp2/transport/bin_encoder.cc \
 src/core/ext/transport/chttp2/transport/bin_encoder.h \
+src/core/ext/transport/chttp2/transport/call_tracer_wrapper.cc \
+src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h \
 src/core/ext/transport/chttp2/transport/chttp2_transport.cc \
 src/core/ext/transport/chttp2/transport/chttp2_transport.h \
 src/core/ext/transport/chttp2/transport/context_list_entry.h \

From c938a7b564eebbd9f8eef8718e2d70e0bd35f093 Mon Sep 17 00:00:00 2001
From: Arjan Singh Bal <46515553+arjan-bal@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:35:25 -0700
Subject: [PATCH 21/74] [interop] Remove python dependencies from Go dockerfile
 and add v1.67.0 release (#37792)

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

## Why
Thanks to @ejona86 for finding this. The python dependencies were wrongly added in https://github.com/grpc/grpc/commit/0589e533cd65a2ca9e0e610cc1b284d016986572. And from then on people were just maintaining what was there. Java had it then too. Java removed the extra dockerfile steps at
https://github.com/grpc/grpc/commit/977e4b1450d9910ccc51f2f8de51e2e00349c969

## Testing
Passing master branch test: https://source.cloud.google.com/results/invocations/79fc6c6f-c3d9-4692-870d-4d7002f4778a
Passing ad-hoc interop matrix build: https://source.cloud.google.com/results/invocations/683d7487-2637-4a69-b65e-95dc82740679

Closes #37792

PiperOrigin-RevId: 681054405
---
 .../dockerfile/gcp_api_libraries_venv.include |  7 ----
 .../grpc_interop_go/Dockerfile.template       |  1 -
 .../grpc_interop_go1.x/Dockerfile.template    |  1 -
 .../run_tests_python_deps_venv.include        | 31 ----------------
 .../dockerimage_current_versions.bzl          |  4 +--
 .../grpc_interop_go.current_version           |  2 +-
 .../interoptest/grpc_interop_go/Dockerfile    | 36 -------------------
 .../grpc_interop_go1.x.current_version        |  2 +-
 .../interoptest/grpc_interop_go1.x/Dockerfile | 36 -------------------
 tools/interop_matrix/client_matrix.py         |  1 +
 10 files changed, 5 insertions(+), 116 deletions(-)
 delete mode 100644 templates/tools/dockerfile/gcp_api_libraries_venv.include
 delete mode 100644 templates/tools/dockerfile/run_tests_python_deps_venv.include

diff --git a/templates/tools/dockerfile/gcp_api_libraries_venv.include b/templates/tools/dockerfile/gcp_api_libraries_venv.include
deleted file mode 100644
index 3cd4b48c44a..00000000000
--- a/templates/tools/dockerfile/gcp_api_libraries_venv.include
+++ /dev/null
@@ -1,7 +0,0 @@
-# Install Google Cloud Platform API libraries
-# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts)
-# This template is similar to gcp_api_libraries.include but installs the
-# dependencies in a python virtual environment. This is required from pip 23.0
-# onwards as installation of system-wide packages is blocked by default.
-RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && \
-  python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0"
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template
index bf6d317fe7c..fa1c1005f77 100644
--- a/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template
@@ -21,7 +21,6 @@
   FROM golang:latest
 
   <%include file="../../go_path.include"/>
-  <%include file="../../run_tests_python_deps_venv.include"/>
   # Define the default command.
   CMD ["bash"]
   
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template
index 3137796840f..46a6de48e60 100644
--- a/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile.template
@@ -17,7 +17,6 @@
   FROM golang:latest
   
   <%include file="../../go_path.include"/>
-  <%include file="../../run_tests_python_deps_venv.include"/>
   # Define the default command.
   CMD ["bash"]
   
diff --git a/templates/tools/dockerfile/run_tests_python_deps_venv.include b/templates/tools/dockerfile/run_tests_python_deps_venv.include
deleted file mode 100644
index 864c26bf526..00000000000
--- a/templates/tools/dockerfile/run_tests_python_deps_venv.include
+++ /dev/null
@@ -1,31 +0,0 @@
-#====================
-# run_tests.py python dependencies
-
-# Basic python dependencies to be able to run tools/run_tests python scripts
-# These dependencies are not sufficient to build gRPC Python, gRPC Python
-# deps are defined elsewhere (e.g. python_deps.include)
-# This template is similar to run_tests_python_deps.include but installs the
-# dependencies in a python virtual environment. This is required from pip 23.0
-# onwards as installation of system-wide packages is blocked by default.
-RUN apt-get update && apt-get install -y ${'\\'}
-  python3 ${'\\'}
-  python3-pip ${'\\'}
-  python3-setuptools ${'\\'}
-  python3-yaml ${'\\'}
-  python3-venv ${'\\'}
-  && apt-get clean
-
-# Create a python virtual env for installing required dependencies.
-ENV PYTHON_ENV="/opt/venv/grpc-interop"
-RUN python3 -m venv "$PYTHON_ENV"
-RUN echo "source $PYTHON_ENV/bin/activate" >> ~/.bashrc
-
-# Use bash explicitly as /bin/sh doesn't support the "source" command.
-# use pinned version of pip to avoid sudden breakages
-# TODO(#36814): currently six is needed for tools/run_tests scripts
-# but since our python2 usage is deprecated, we should get rid of it.
-RUN /bin/bash -c "source $PYTHON_ENV/bin/activate && \
-  python3 -m pip install --upgrade pip==19.3.1 && \
-  python3 -m pip install six==1.16.0"
-
-<%include file="./gcp_api_libraries_venv.include"/>
diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl
index 973a649dfe5..541d9a7b9dc 100644
--- a/tools/bazelify_tests/dockerimage_current_versions.bzl
+++ b/tools/bazelify_tests/dockerimage_current_versions.bzl
@@ -72,12 +72,12 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
     "tools/dockerfile/interoptest/grpc_interop_aspnetcore.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_aspnetcore@sha256:8e2e732e78724a8382c340dca72e7653c5f82c251a3110fa2874cc00ba538878",
     "tools/dockerfile/interoptest/grpc_interop_cxx.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_cxx@sha256:e5a474d33773d52ec6a8abbe2d61ee0c2a9c2b5f48793a5ea3b82c4445becf3f",
     "tools/dockerfile/interoptest/grpc_interop_dart.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_dart@sha256:4915a280788126dad029858eb384dbbef2dc18cadccb434df6450dfd7a4929f2",
-    "tools/dockerfile/interoptest/grpc_interop_go.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go@sha256:c925667feb3e065abf586a9e8b028f64b4673cb94bfb4b5e389c652ce906f5dc",
+    "tools/dockerfile/interoptest/grpc_interop_go.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89",
     "tools/dockerfile/interoptest/grpc_interop_go1.11.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.11@sha256:f2fe3a0a581c687ee4217bf58fd42b18bb1f63d3d006f1b67379ff553b0e23c6",
     "tools/dockerfile/interoptest/grpc_interop_go1.16.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.16@sha256:3767f47c9d06584c6c07b7ab536e13f3e87550330e6c2652ad288d3a72b0de23",
     "tools/dockerfile/interoptest/grpc_interop_go1.19.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.19@sha256:889e7ff34399a5e16af87940d1eaa239e56da307f7faca3f8f1d28379c2e3df3",
     "tools/dockerfile/interoptest/grpc_interop_go1.8.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.8@sha256:7830a301b37539252c592b9cd7fa30a6142d0afc717a05fc8d2b82c74fb45efe",
-    "tools/dockerfile/interoptest/grpc_interop_go1.x.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x@sha256:9d02b61552a93770ebb022f588daf9acd1088d29197fe120e0b082ede73f4584",
+    "tools/dockerfile/interoptest/grpc_interop_go1.x.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89",
     "tools/dockerfile/interoptest/grpc_interop_http2.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_http2@sha256:e3f247d8038374848fadf7215b841e3575c0b2a4217feb503a79b8004b164c5a",
     "tools/dockerfile/interoptest/grpc_interop_java.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_java@sha256:6c0319bbbf77d6c198f61adf92d205efd33cbd2cccaf914a1af8f2dcb61b16a1",
     "tools/dockerfile/interoptest/grpc_interop_node.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_node@sha256:549a7683cc024fb7ffee807eaa8acb6c2d5a5dd0184a2590f91852804eea39a4",
diff --git a/tools/dockerfile/interoptest/grpc_interop_go.current_version b/tools/dockerfile/interoptest/grpc_interop_go.current_version
index 2aca19d40be..c703fa40ee4 100644
--- a/tools/dockerfile/interoptest/grpc_interop_go.current_version
+++ b/tools/dockerfile/interoptest/grpc_interop_go.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:969ce4614d1152a43f9083e7d08f1932c63a1616@sha256:c925667feb3e065abf586a9e8b028f64b4673cb94bfb4b5e389c652ce906f5dc
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go:e779403fffab573454461a7357acf9851c14b640@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89
\ No newline at end of file
diff --git a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
index bf41ce181e0..2968da76eda 100644
--- a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
@@ -21,41 +21,5 @@ FROM golang:latest
 # Using login shell removes Go from path, so we add it.
 RUN ln -s /usr/local/go/bin/go /usr/local/bin
 
-#====================
-# run_tests.py python dependencies
-
-# Basic python dependencies to be able to run tools/run_tests python scripts
-# These dependencies are not sufficient to build gRPC Python, gRPC Python
-# deps are defined elsewhere (e.g. python_deps.include)
-# This template is similar to run_tests_python_deps.include but installs the
-# dependencies in a python virtual environment. This is required from pip 23.0
-# onwards as installation of system-wide packages is blocked by default.
-RUN apt-get update && apt-get install -y \
-  python3 \
-  python3-pip \
-  python3-setuptools \
-  python3-yaml \
-  python3-venv \
-  && apt-get clean
-
-# Create a python virtual env for installing required dependencies.
-ENV PYTHON_ENV="/opt/venv/grpc-interop"
-RUN python3 -m venv "$PYTHON_ENV"
-RUN echo "source $PYTHON_ENV/bin/activate" >> ~/.bashrc
-
-# Use bash explicitly as /bin/sh doesn't support the "source" command.
-# use pinned version of pip to avoid sudden breakages
-# TODO(#36814): currently six is needed for tools/run_tests scripts
-# but since our python2 usage is deprecated, we should get rid of it.
-RUN /bin/bash -c "source $PYTHON_ENV/bin/activate &&   python3 -m pip install --upgrade pip==19.3.1 &&   python3 -m pip install six==1.16.0"
-
-# Install Google Cloud Platform API libraries
-# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts)
-# This template is similar to gcp_api_libraries.include but installs the
-# dependencies in a python virtual environment. This is required from pip 23.0
-# onwards as installation of system-wide packages is blocked by default.
-RUN /bin/bash -c "source $PYTHON_ENV/bin/activate &&   python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0"
-
-
 # Define the default command.
 CMD ["bash"]
diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version b/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version
index 99a32701de6..d8b3e4cd6bc 100644
--- a/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version
+++ b/tools/dockerfile/interoptest/grpc_interop_go1.x.current_version
@@ -1 +1 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x:9a524415365a73162b7f463bf0409ca04f64a73c@sha256:9d02b61552a93770ebb022f588daf9acd1088d29197fe120e0b082ede73f4584
\ No newline at end of file
+us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_interop_go1.x:a50334d44bb6c5d23b08622328d97266b4bfacd8@sha256:7affc40dd8c229a12aff76c44b173ce786fced97e563777640b5d696f1d8cd89
\ No newline at end of file
diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile
index 8aa291f0173..439757fc1a5 100644
--- a/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_go1.x/Dockerfile
@@ -17,41 +17,5 @@ FROM golang:latest
 # Using login shell removes Go from path, so we add it.
 RUN ln -s /usr/local/go/bin/go /usr/local/bin
 
-#====================
-# run_tests.py python dependencies
-
-# Basic python dependencies to be able to run tools/run_tests python scripts
-# These dependencies are not sufficient to build gRPC Python, gRPC Python
-# deps are defined elsewhere (e.g. python_deps.include)
-# This template is similar to run_tests_python_deps.include but installs the
-# dependencies in a python virtual environment. This is required from pip 23.0
-# onwards as installation of system-wide packages is blocked by default.
-RUN apt-get update && apt-get install -y \
-  python3 \
-  python3-pip \
-  python3-setuptools \
-  python3-yaml \
-  python3-venv \
-  && apt-get clean
-
-# Create a python virtual env for installing required dependencies.
-ENV PYTHON_ENV="/opt/venv/grpc-interop"
-RUN python3 -m venv "$PYTHON_ENV"
-RUN echo "source $PYTHON_ENV/bin/activate" >> ~/.bashrc
-
-# Use bash explicitly as /bin/sh doesn't support the "source" command.
-# use pinned version of pip to avoid sudden breakages
-# TODO(#36814): currently six is needed for tools/run_tests scripts
-# but since our python2 usage is deprecated, we should get rid of it.
-RUN /bin/bash -c "source $PYTHON_ENV/bin/activate &&   python3 -m pip install --upgrade pip==19.3.1 &&   python3 -m pip install six==1.16.0"
-
-# Install Google Cloud Platform API libraries
-# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts)
-# This template is similar to gcp_api_libraries.include but installs the
-# dependencies in a python virtual environment. This is required from pip 23.0
-# onwards as installation of system-wide packages is blocked by default.
-RUN /bin/bash -c "source $PYTHON_ENV/bin/activate &&   python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0"
-
-
 # Define the default command.
 CMD ["bash"]
diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index bc4ea2d919e..1ec4c542fdc 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -306,6 +306,7 @@ LANG_RELEASE_MATRIX = {
             ("v1.64.1", ReleaseInfo()),
             ("v1.65.0", ReleaseInfo()),
             ("v1.66.2", ReleaseInfo()),
+            ("v1.67.0", ReleaseInfo()),
         ]
     ),
     "java": OrderedDict(

From 74e640341d02e3e821232644fd26542e64c1e7cc Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Tue, 1 Oct 2024 13:42:53 -0700
Subject: [PATCH 22/74] [CSM O11y] Example logs (#37823)

Closes #37823

PiperOrigin-RevId: 681149244
---
 examples/cpp/csm/observability/BUILD                 | 2 ++
 examples/cpp/csm/observability/Dockerfile.server     | 2 ++
 examples/cpp/csm/observability/csm_greeter_server.cc | 5 +++++
 examples/cpp/otel/util.cc                            | 4 ++--
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/examples/cpp/csm/observability/BUILD b/examples/cpp/csm/observability/BUILD
index d6d8bb0eb33..e27bb9cfb5f 100644
--- a/examples/cpp/csm/observability/BUILD
+++ b/examples/cpp/csm/observability/BUILD
@@ -44,6 +44,8 @@ cc_binary(
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/flags:parse",
         "@com_google_absl//absl/log",
+        "@com_google_absl//absl/log:globals",
+        "@com_google_absl//absl/log:initialize",
         "@io_opentelemetry_cpp//exporters/prometheus:prometheus_exporter",
         "@io_opentelemetry_cpp//sdk/src/metrics",
     ],
diff --git a/examples/cpp/csm/observability/Dockerfile.server b/examples/cpp/csm/observability/Dockerfile.server
index a6d82fdc793..1439072ec29 100644
--- a/examples/cpp/csm/observability/Dockerfile.server
+++ b/examples/cpp/csm/observability/Dockerfile.server
@@ -27,6 +27,8 @@ RUN cp -rL /workdir/bazel-bin/examples/cpp/csm/observability/csm_greeter_server
 
 FROM python:3.9-slim-bookworm
 
+ENV GRPC_TRACE="xds_client,xds_resolver,xds_cluster_manager_lb,cds_lb,xds_cluster_resolver_lb,priority_lb,xds_cluster_impl_lb,weighted_target_lb,xds_server_config_fetcher,ring_hash_lb,outlier_detection_lb,xds_wrr_locality_lb,xds_override_host_lb"
+
 RUN apt-get update \
     && apt-get -y upgrade \
     && apt-get -y autoremove \
diff --git a/examples/cpp/csm/observability/csm_greeter_server.cc b/examples/cpp/csm/observability/csm_greeter_server.cc
index 12cdef49ca4..a3d7eccd978 100644
--- a/examples/cpp/csm/observability/csm_greeter_server.cc
+++ b/examples/cpp/csm/observability/csm_greeter_server.cc
@@ -22,6 +22,8 @@
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
+#include "absl/log/globals.h"
+#include "absl/log/initialize.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "examples/cpp/otel/util.h"
@@ -42,6 +44,9 @@ ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
 
 int main(int argc, char** argv) {
   absl::ParseCommandLine(argc, argv);
+  absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
+  absl::SetGlobalVLogLevel(2);
+  absl::InitializeLog();
   opentelemetry::exporter::metrics::PrometheusExporterOptions opts;
   // default was "localhost:9464" which causes connection issue across GKE pods
   opts.url = "0.0.0.0:9464";
diff --git a/examples/cpp/otel/util.cc b/examples/cpp/otel/util.cc
index cba83f736ad..f844a044a6e 100644
--- a/examples/cpp/otel/util.cc
+++ b/examples/cpp/otel/util.cc
@@ -169,10 +169,10 @@ void RunClient(const std::string& target_str) {
   // are created. This channel models a connection to an endpoint specified by
   // the argument "--target=" which is the only expected argument.
   grpc::ChannelArguments args;
+  GreeterClient greeter(grpc::CreateCustomChannel(
+      target_str, grpc::InsecureChannelCredentials(), args));
   // Continuously send RPCs every second.
   while (true) {
-    GreeterClient greeter(grpc::CreateCustomChannel(
-        target_str, grpc::InsecureChannelCredentials(), args));
     std::string user("world");
     std::string reply = greeter.SayHello(user);
     std::cout << "Greeter received: " << reply << std::endl;

From 9a12ec91e10c555cadc42893983a3e8ac30eb805 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 1 Oct 2024 13:44:59 -0700
Subject: [PATCH 23/74] [xds_client_test] change test to use FuzzingEventEngine
 (#37668)

Closes #37668

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37668 from markdroth:xds_client_test_fuzzing_ee e1fe7f56c268ba8088a0ed931a533c22007248fc
PiperOrigin-RevId: 681150007
---
 CMakeLists.txt                                |   6 +
 build_autogenerated.yaml                      |   5 +
 .../fuzzing_event_engine.cc                   |  17 +-
 .../fuzzing_event_engine.h                    |   5 +
 test/core/xds/BUILD                           |   9 +-
 test/core/xds/xds_client_fuzzer.cc            |  40 ++-
 test/core/xds/xds_client_fuzzer.proto         |   2 +
 test/core/xds/xds_client_test.cc              | 267 ++++++++++--------
 test/core/xds/xds_transport_fake.cc           |  79 +++---
 test/core/xds/xds_transport_fake.h            |  44 ++-
 10 files changed, 269 insertions(+), 205 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99147ab3f31..41e69b70ab7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34193,8 +34193,14 @@ add_executable(xds_client_test
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.cc
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.pb.h
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.h
   src/cpp/client/global_callback_hook.cc
   src/cpp/util/status.cc
+  test/core/event_engine/event_engine_test_utils.cc
+  test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
   test/core/xds/xds_client_test.cc
   test/core/xds/xds_transport_fake.cc
 )
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 1dd0e4f335f..3ae9dd5577c 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -21562,6 +21562,8 @@ targets:
   build: test
   language: c++
   headers:
+  - test/core/event_engine/event_engine_test_utils.h
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
   - test/core/test_util/scoped_env_var.h
   - test/core/xds/xds_client_test_peer.h
   - test/core/xds/xds_transport_fake.h
@@ -21569,8 +21571,11 @@ targets:
   - src/proto/grpc/testing/xds/v3/base.proto
   - src/proto/grpc/testing/xds/v3/discovery.proto
   - src/proto/grpc/testing/xds/v3/percent.proto
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto
   - src/cpp/client/global_callback_hook.cc
   - src/cpp/util/status.cc
+  - test/core/event_engine/event_engine_test_utils.cc
+  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
   - test/core/xds/xds_client_test.cc
   - test/core/xds/xds_transport_fake.cc
   deps:
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
index 0a85dafe2b4..1bc8a7a203e 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
@@ -194,16 +194,23 @@ void FuzzingEventEngine::TickUntilIdle() {
           << "TickUntilIdle: "
           << GRPC_DUMP_ARGS(tasks_by_id_.size(), outstanding_reads_.load(),
                             outstanding_writes_.load());
-      if (tasks_by_id_.empty() &&
-          outstanding_writes_.load(std::memory_order_relaxed) == 0 &&
-          outstanding_reads_.load(std::memory_order_relaxed) == 0) {
-        return;
-      }
+      if (IsIdleLocked()) return;
     }
     Tick();
   }
 }
 
+bool FuzzingEventEngine::IsIdle() {
+  grpc_core::MutexLock lock(&*mu_);
+  return IsIdleLocked();
+}
+
+bool FuzzingEventEngine::IsIdleLocked() {
+  return tasks_by_id_.empty() &&
+         outstanding_writes_.load(std::memory_order_relaxed) == 0 &&
+         outstanding_reads_.load(std::memory_order_relaxed) == 0;
+}
+
 void FuzzingEventEngine::TickUntil(Time t) {
   while (true) {
     auto now = Now();
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
index 23193ce99c6..6ff76e32a23 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
@@ -72,6 +72,8 @@ class FuzzingEventEngine : public EventEngine {
       ABSL_LOCKS_EXCLUDED(mu_);
   // Repeatedly call Tick() until there is no more work to do.
   void TickUntilIdle() ABSL_LOCKS_EXCLUDED(mu_);
+  // Returns true if idle.
+  bool IsIdle() ABSL_LOCKS_EXCLUDED(mu_);
   // Tick until some time
   void TickUntil(Time t) ABSL_LOCKS_EXCLUDED(mu_);
   // Tick for some duration
@@ -296,6 +298,9 @@ class FuzzingEventEngine : public EventEngine {
   int AllocatePort() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
   // Is the given port in use by any listener?
   bool IsPortUsed(int port) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
+
+  bool IsIdleLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
+
   // For the next connection being built, query the list of fuzzer selected
   // write size limits.
   std::queue<size_t> WriteSizesForConnection()
diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD
index f152a44953f..03fe7802783 100644
--- a/test/core/xds/BUILD
+++ b/test/core/xds/BUILD
@@ -145,6 +145,7 @@ grpc_cc_library(
         "//:orphanable",
         "//:ref_counted_ptr",
         "//:xds_client",
+        "//test/core/event_engine/fuzzing_event_engine",
         "//test/core/test_util:grpc_test_util",
     ],
 )
@@ -166,7 +167,6 @@ grpc_cc_test(
     srcs = ["xds_client_test.cc"],
     external_deps = ["gtest"],
     language = "C++",
-    shard_count = 10,
     uses_event_engine = True,
     uses_polling = False,
     deps = [
@@ -174,6 +174,8 @@ grpc_cc_test(
         ":xds_transport_fake",
         "//:xds_client",
         "//src/proto/grpc/testing/xds/v3:discovery_proto",
+        "//test/core/event_engine:event_engine_test_utils",
+        "//test/core/event_engine/fuzzing_event_engine",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
     ],
@@ -188,9 +190,10 @@ grpc_proto_fuzzer(
     proto = "xds_client_fuzzer.proto",
     proto_deps = [
         "//src/proto/grpc/testing/xds/v3:discovery_proto",
+        "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
     ],
     tags = ["no_windows"],
-    uses_event_engine = False,
+    uses_event_engine = True,
     uses_polling = False,
     deps = [
         ":xds_client_test_peer",
@@ -206,6 +209,8 @@ grpc_proto_fuzzer(
         "//src/proto/grpc/testing/xds/v3:endpoint_proto",
         "//src/proto/grpc/testing/xds/v3:http_connection_manager_proto",
         "//src/proto/grpc/testing/xds/v3:router_proto",
+        "//test/core/event_engine/fuzzing_event_engine",
+        "//test/core/event_engine:event_engine_test_utils",
     ],
 )
 
diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc
index ef660977c8d..158563429e8 100644
--- a/test/core/xds/xds_client_fuzzer.cc
+++ b/test/core/xds/xds_client_fuzzer.cc
@@ -30,7 +30,7 @@
 
 #include <grpc/grpc.h>
 
-#include "src/core/lib/event_engine/default_event_engine.h"
+#include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
@@ -46,15 +46,24 @@
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/libfuzzer/libfuzzer_macro.h"
 #include "src/proto/grpc/testing/xds/v3/discovery.pb.h"
+#include "test/core/event_engine/event_engine_test_utils.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 #include "test/core/xds/xds_client_fuzzer.pb.h"
 #include "test/core/xds/xds_client_test_peer.h"
 #include "test/core/xds/xds_transport_fake.h"
 
+using grpc_event_engine::experimental::FuzzingEventEngine;
+
 namespace grpc_core {
 
 class Fuzzer {
  public:
-  explicit Fuzzer(absl::string_view bootstrap_json) {
+  Fuzzer(absl::string_view bootstrap_json,
+         const fuzzing_event_engine::Actions& fuzzing_ee_actions) {
+    event_engine_ = std::make_shared<FuzzingEventEngine>(
+        FuzzingEventEngine::Options(), fuzzing_ee_actions);
+    grpc_timer_manager_set_start_threaded(false);
+    grpc_init();
     auto bootstrap = GrpcXdsBootstrap::Create(bootstrap_json);
     if (!bootstrap.ok()) {
       LOG(ERROR) << "error creating bootstrap: " << bootstrap.status();
@@ -62,15 +71,25 @@ class Fuzzer {
       return;
     }
     transport_factory_ = MakeRefCounted<FakeXdsTransportFactory>(
-        []() { Crash("Multiple concurrent reads"); });
+        []() { Crash("Multiple concurrent reads"); }, event_engine_);
     transport_factory_->SetAutoCompleteMessagesFromClient(false);
     transport_factory_->SetAbortOnUndrainedMessages(false);
     xds_client_ = MakeRefCounted<XdsClient>(
-        std::move(*bootstrap), transport_factory_,
-        grpc_event_engine::experimental::GetDefaultEventEngine(),
+        std::move(*bootstrap), transport_factory_, event_engine_,
         /*metrics_reporter=*/nullptr, "foo agent", "foo version");
   }
 
+  ~Fuzzer() {
+    transport_factory_.reset();
+    xds_client_.reset();
+    event_engine_->FuzzingDone();
+    event_engine_->TickUntilIdle();
+    event_engine_->UnsetGlobalHooks();
+    grpc_event_engine::experimental::WaitForSingleOwner(
+        std::move(event_engine_));
+    grpc_shutdown_blocking();
+  }
+
   void Act(const xds_client_fuzzer::Action& action) {
     if (xds_client_ == nullptr) return;
     switch (action.action_type_case()) {
@@ -276,8 +295,7 @@ class Fuzzer {
     if (xds_server == nullptr) return nullptr;
     const char* method = StreamIdMethod(stream_id);
     if (method == nullptr) return nullptr;
-    return transport_factory_->WaitForStream(*xds_server, method,
-                                             absl::ZeroDuration());
+    return transport_factory_->WaitForStream(*xds_server, method);
   }
 
   static std::string StreamIdString(
@@ -293,7 +311,7 @@ class Fuzzer {
     auto stream = GetStream(stream_id);
     if (stream == nullptr) return;
     LOG(INFO) << "    stream=" << stream.get();
-    auto message = stream->WaitForMessageFromClient(absl::ZeroDuration());
+    auto message = stream->WaitForMessageFromClient();
     if (message.has_value()) {
       LOG(INFO) << "    completing send_message";
       stream->CompleteSendMessageFromClient(ok);
@@ -320,6 +338,7 @@ class Fuzzer {
     stream->MaybeSendStatusToClient(std::move(status));
   }
 
+  std::shared_ptr<FuzzingEventEngine> event_engine_;
   RefCountedPtr<XdsClient> xds_client_;
   RefCountedPtr<FakeXdsTransportFactory> transport_factory_;
 
@@ -336,10 +355,9 @@ class Fuzzer {
 bool squelch = true;
 
 DEFINE_PROTO_FUZZER(const xds_client_fuzzer::Msg& message) {
-  grpc_init();
-  grpc_core::Fuzzer fuzzer(message.bootstrap());
+  grpc_core::Fuzzer fuzzer(message.bootstrap(),
+                           message.fuzzing_event_engine_actions());
   for (int i = 0; i < message.actions_size(); i++) {
     fuzzer.Act(message.actions(i));
   }
-  grpc_shutdown();
 }
diff --git a/test/core/xds/xds_client_fuzzer.proto b/test/core/xds/xds_client_fuzzer.proto
index e2ce7aa5d46..ae32016c644 100644
--- a/test/core/xds/xds_client_fuzzer.proto
+++ b/test/core/xds/xds_client_fuzzer.proto
@@ -19,6 +19,7 @@ syntax = "proto3";
 package xds_client_fuzzer;
 
 import "src/proto/grpc/testing/xds/v3/discovery.proto";
+import "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto";
 
 // We'd ideally like to use google.rpc.Status instead of creating our
 // own proto for this, but that winds up causing all sorts of dependency
@@ -120,4 +121,5 @@ message Action {
 message Msg {
   string bootstrap = 1;
   repeated Action actions = 2;
+  fuzzing_event_engine.Actions fuzzing_event_engine_actions = 3;
 }
diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc
index 87e3a8a2e11..c28966f2c23 100644
--- a/test/core/xds/xds_client_test.cc
+++ b/test/core/xds/xds_client_test.cc
@@ -46,7 +46,7 @@
 #include <grpc/support/json.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 
-#include "src/core/lib/event_engine/default_event_engine.h"
+#include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
@@ -59,6 +59,8 @@
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
 #include "src/proto/grpc/testing/xds/v3/base.pb.h"
 #include "src/proto/grpc/testing/xds/v3/discovery.pb.h"
+#include "test/core/event_engine/event_engine_test_utils.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/xds/xds_client_test_peer.h"
@@ -73,6 +75,7 @@
 
 using envoy::service::discovery::v3::DiscoveryRequest;
 using envoy::service::discovery::v3::DiscoveryResponse;
+using grpc_event_engine::experimental::FuzzingEventEngine;
 
 namespace grpc_core {
 namespace testing {
@@ -252,6 +255,9 @@ class XdsClientTest : public ::testing::Test {
                                             all_resources_required_in_sotw>,
                         ResourceStruct>::WatcherInterface {
      public:
+      explicit Watcher(std::shared_ptr<FuzzingEventEngine> event_engine)
+          : event_engine_(std::move(event_engine)) {}
+
       ~Watcher() override {
         MutexLock lock(&mu_);
         EXPECT_THAT(queue_, ::testing::IsEmpty())
@@ -270,42 +276,46 @@ class XdsClientTest : public ::testing::Test {
                    });
       }
 
-      // Returns true if no event is received during the timeout period.
-      bool ExpectNoEvent(absl::Duration timeout) {
-        MutexLock lock(&mu_);
-        return !WaitForEventLocked(timeout);
-      }
-
       bool HasEvent() {
         MutexLock lock(&mu_);
         return !queue_.empty();
       }
 
+      // Returns true if no event is received after draining the fuzzing
+      // EE queue.
+      bool ExpectNoEvent() {
+        event_engine_->TickUntilIdle();
+        return !HasEvent();
+      }
+
       absl::optional<ResourceAndReadDelayHandle> WaitForNextResourceAndHandle(
-          absl::Duration timeout = absl::Seconds(1),
           SourceLocation location = SourceLocation()) {
-        MutexLock lock(&mu_);
-        if (!WaitForEventLocked(timeout)) return absl::nullopt;
-        Event& event = queue_.front();
-        if (!absl::holds_alternative<ResourceAndReadDelayHandle>(event)) {
-          EXPECT_TRUE(false)
-              << "got unexpected event "
-              << (absl::holds_alternative<absl::Status>(event)
-                      ? "error"
-                      : "does-not-exist")
-              << " at " << location.file() << ":" << location.line();
-          return absl::nullopt;
+        while (true) {
+          event_engine_->Tick();
+          MutexLock lock(&mu_);
+          if (queue_.empty()) {
+            if (event_engine_->IsIdle()) return absl::nullopt;
+            continue;
+          }
+          Event& event = queue_.front();
+          if (!absl::holds_alternative<ResourceAndReadDelayHandle>(event)) {
+            EXPECT_TRUE(false)
+                << "got unexpected event "
+                << (absl::holds_alternative<absl::Status>(event)
+                        ? "error"
+                        : "does-not-exist")
+                << " at " << location.file() << ":" << location.line();
+            return absl::nullopt;
+          }
+          auto foo = std::move(absl::get<ResourceAndReadDelayHandle>(event));
+          queue_.pop_front();
+          return foo;
         }
-        auto foo = std::move(absl::get<ResourceAndReadDelayHandle>(event));
-        queue_.pop_front();
-        return foo;
       }
 
       std::shared_ptr<const ResourceStruct> WaitForNextResource(
-          absl::Duration timeout = absl::Seconds(1),
           SourceLocation location = SourceLocation()) {
-        auto resource_and_handle =
-            WaitForNextResourceAndHandle(timeout, location);
+        auto resource_and_handle = WaitForNextResourceAndHandle(location);
         if (!resource_and_handle.has_value()) {
           return nullptr;
         }
@@ -313,40 +323,50 @@ class XdsClientTest : public ::testing::Test {
       }
 
       absl::optional<absl::Status> WaitForNextError(
-          absl::Duration timeout = absl::Seconds(1),
           SourceLocation location = SourceLocation()) {
-        MutexLock lock(&mu_);
-        if (!WaitForEventLocked(timeout)) return absl::nullopt;
-        Event& event = queue_.front();
-        if (!absl::holds_alternative<absl::Status>(event)) {
-          EXPECT_TRUE(false)
-              << "got unexpected event "
-              << (absl::holds_alternative<ResourceAndReadDelayHandle>(event)
-                      ? "resource"
-                      : "does-not-exist")
-              << " at " << location.file() << ":" << location.line();
-          return absl::nullopt;
+        while (true) {
+          event_engine_->Tick();
+          MutexLock lock(&mu_);
+          if (queue_.empty()) {
+            if (event_engine_->IsIdle()) return absl::nullopt;
+            continue;
+          }
+          Event& event = queue_.front();
+          if (!absl::holds_alternative<absl::Status>(event)) {
+            EXPECT_TRUE(false)
+                << "got unexpected event "
+                << (absl::holds_alternative<ResourceAndReadDelayHandle>(event)
+                        ? "resource"
+                        : "does-not-exist")
+                << " at " << location.file() << ":" << location.line();
+            return absl::nullopt;
+          }
+          absl::Status error = std::move(absl::get<absl::Status>(event));
+          queue_.pop_front();
+          return std::move(error);
         }
-        absl::Status error = std::move(absl::get<absl::Status>(event));
-        queue_.pop_front();
-        return std::move(error);
       }
 
-      bool WaitForDoesNotExist(absl::Duration timeout,
-                               SourceLocation location = SourceLocation()) {
-        MutexLock lock(&mu_);
-        if (!WaitForEventLocked(timeout)) return false;
-        Event& event = queue_.front();
-        if (!absl::holds_alternative<DoesNotExist>(event)) {
-          EXPECT_TRUE(false)
-              << "got unexpected event "
-              << (absl::holds_alternative<absl::Status>(event) ? "error"
-                                                               : "resource")
-              << " at " << location.file() << ":" << location.line();
-          return false;
+      bool WaitForDoesNotExist(SourceLocation location = SourceLocation()) {
+        while (true) {
+          event_engine_->Tick();
+          MutexLock lock(&mu_);
+          if (queue_.empty()) {
+            if (event_engine_->IsIdle()) return false;
+            continue;
+          }
+          Event& event = queue_.front();
+          if (!absl::holds_alternative<DoesNotExist>(event)) {
+            EXPECT_TRUE(false)
+                << "got unexpected event "
+                << (absl::holds_alternative<absl::Status>(event) ? "error"
+                                                                 : "resource")
+                << " at " << location.file() << ":" << location.line();
+            return false;
+          }
+          queue_.pop_front();
+          return true;
         }
-        queue_.pop_front();
-        return true;
       }
 
      private:
@@ -361,7 +381,6 @@ class XdsClientTest : public ::testing::Test {
         ResourceAndReadDelayHandle event_details = {
             std::move(foo), std::move(read_delay_handle)};
         queue_.emplace_back(std::move(event_details));
-        cv_.Signal();
       }
 
       void OnError(
@@ -370,7 +389,6 @@ class XdsClientTest : public ::testing::Test {
           override {
         MutexLock lock(&mu_);
         queue_.push_back(std::move(status));
-        cv_.Signal();
       }
 
       void OnResourceDoesNotExist(
@@ -378,24 +396,11 @@ class XdsClientTest : public ::testing::Test {
           override {
         MutexLock lock(&mu_);
         queue_.push_back(DoesNotExist());
-        cv_.Signal();
       }
 
-      // Returns true if an event was received, or false if the timeout
-      // expires before any event is received.
-      bool WaitForEventLocked(absl::Duration timeout)
-          ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_) {
-        while (queue_.empty()) {
-          if (cv_.WaitWithTimeout(&mu_,
-                                  timeout * grpc_test_slowdown_factor())) {
-            return false;
-          }
-        }
-        return true;
-      }
+      std::shared_ptr<FuzzingEventEngine> event_engine_;
 
       Mutex mu_;
-      CondVar cv_;
       std::deque<Event> queue_ ABSL_GUARDED_BY(&mu_);
     };
 
@@ -626,6 +631,9 @@ class XdsClientTest : public ::testing::Test {
         uint64_t>;
     using ServerFailureMap = std::map<std::string /*xds_server*/, uint64_t>;
 
+    explicit MetricsReporter(std::shared_ptr<FuzzingEventEngine> event_engine)
+        : event_engine_(std::move(event_engine)) {}
+
     ResourceUpdateMap resource_updates_valid() const {
       MutexLock lock(&mu_);
       return resource_updates_valid_;
@@ -643,12 +651,10 @@ class XdsClientTest : public ::testing::Test {
         ::testing::Matcher<ResourceUpdateMap> resource_updates_valid_matcher,
         ::testing::Matcher<ResourceUpdateMap> resource_updates_invalid_matcher,
         ::testing::Matcher<ServerFailureMap> server_failures_matcher,
-        absl::Duration timeout = absl::Seconds(3),
         SourceLocation location = SourceLocation()) {
-      const absl::Time deadline =
-          absl::Now() + (timeout * grpc_test_slowdown_factor());
-      MutexLock lock(&mu_);
       while (true) {
+        event_engine_->Tick();
+        MutexLock lock(&mu_);
         if (::testing::Matches(resource_updates_valid_matcher)(
                 resource_updates_valid_) &&
             ::testing::Matches(resource_updates_invalid_matcher)(
@@ -656,15 +662,15 @@ class XdsClientTest : public ::testing::Test {
             ::testing::Matches(server_failures_matcher)(server_failures_)) {
           return true;
         }
-        if (cond_.WaitWithDeadline(&mu_, deadline)) break;
+        if (!event_engine_->IsIdle()) continue;
+        EXPECT_THAT(resource_updates_valid_, resource_updates_valid_matcher)
+            << location.file() << ":" << location.line();
+        EXPECT_THAT(resource_updates_invalid_, resource_updates_invalid_matcher)
+            << location.file() << ":" << location.line();
+        EXPECT_THAT(server_failures_, server_failures_matcher)
+            << location.file() << ":" << location.line();
+        return false;
       }
-      EXPECT_THAT(resource_updates_valid_, resource_updates_valid_matcher)
-          << location.file() << ":" << location.line();
-      EXPECT_THAT(resource_updates_invalid_, resource_updates_invalid_matcher)
-          << location.file() << ":" << location.line();
-      EXPECT_THAT(server_failures_, server_failures_matcher)
-          << location.file() << ":" << location.line();
-      return false;
     }
 
    private:
@@ -690,6 +696,8 @@ class XdsClientTest : public ::testing::Test {
       cond_.SignalAll();
     }
 
+    std::shared_ptr<FuzzingEventEngine> event_engine_;
+
     mutable Mutex mu_;
     ResourceUpdateMap resource_updates_valid_ ABSL_GUARDED_BY(mu_);
     ResourceUpdateMap resource_updates_invalid_ ABSL_GUARDED_BY(mu_);
@@ -724,18 +732,35 @@ class XdsClientTest : public ::testing::Test {
     return server_connection_map;
   }
 
+  void SetUp() override {
+    event_engine_ = std::make_shared<FuzzingEventEngine>(
+        FuzzingEventEngine::Options(), fuzzing_event_engine::Actions());
+    grpc_timer_manager_set_start_threaded(false);
+    grpc_init();
+  }
+
+  void TearDown() override {
+    transport_factory_.reset();
+    xds_client_.reset();
+    event_engine_->FuzzingDone();
+    event_engine_->TickUntilIdle();
+    event_engine_->UnsetGlobalHooks();
+    grpc_event_engine::experimental::WaitForSingleOwner(
+        std::move(event_engine_));
+    grpc_shutdown_blocking();
+  }
+
   // Sets transport_factory_ and initializes xds_client_ with the
   // specified bootstrap config.
   void InitXdsClient(
       FakeXdsBootstrap::Builder bootstrap_builder = FakeXdsBootstrap::Builder(),
       Duration resource_request_timeout = Duration::Seconds(15)) {
     transport_factory_ = MakeRefCounted<FakeXdsTransportFactory>(
-        []() { FAIL() << "Multiple concurrent reads"; });
-    auto metrics_reporter = std::make_unique<MetricsReporter>();
+        []() { FAIL() << "Multiple concurrent reads"; }, event_engine_);
+    auto metrics_reporter = std::make_unique<MetricsReporter>(event_engine_);
     metrics_reporter_ = metrics_reporter.get();
     xds_client_ = MakeRefCounted<XdsClient>(
-        bootstrap_builder.Build(), transport_factory_,
-        grpc_event_engine::experimental::GetDefaultEventEngine(),
+        bootstrap_builder.Build(), transport_factory_, event_engine_,
         std::move(metrics_reporter), "foo agent", "foo version",
         resource_request_timeout * grpc_test_slowdown_factor());
   }
@@ -743,7 +768,7 @@ class XdsClientTest : public ::testing::Test {
   // Starts and cancels a watch for a Foo resource.
   RefCountedPtr<XdsFooResourceType::Watcher> StartFooWatch(
       absl::string_view resource_name) {
-    auto watcher = MakeRefCounted<XdsFooResourceType::Watcher>();
+    auto watcher = MakeRefCounted<XdsFooResourceType::Watcher>(event_engine_);
     XdsFooResourceType::StartWatch(xds_client_.get(), resource_name, watcher);
     return watcher;
   }
@@ -757,7 +782,7 @@ class XdsClientTest : public ::testing::Test {
   // Starts and cancels a watch for a Bar resource.
   RefCountedPtr<XdsBarResourceType::Watcher> StartBarWatch(
       absl::string_view resource_name) {
-    auto watcher = MakeRefCounted<XdsBarResourceType::Watcher>();
+    auto watcher = MakeRefCounted<XdsBarResourceType::Watcher>(event_engine_);
     XdsBarResourceType::StartWatch(xds_client_.get(), resource_name, watcher);
     return watcher;
   }
@@ -771,7 +796,8 @@ class XdsClientTest : public ::testing::Test {
   // Starts and cancels a watch for a WildcardCapable resource.
   RefCountedPtr<XdsWildcardCapableResourceType::Watcher>
   StartWildcardCapableWatch(absl::string_view resource_name) {
-    auto watcher = MakeRefCounted<XdsWildcardCapableResourceType::Watcher>();
+    auto watcher =
+        MakeRefCounted<XdsWildcardCapableResourceType::Watcher>(event_engine_);
     XdsWildcardCapableResourceType::StartWatch(xds_client_.get(), resource_name,
                                                watcher);
     return watcher;
@@ -784,11 +810,13 @@ class XdsClientTest : public ::testing::Test {
   }
 
   RefCountedPtr<FakeXdsTransportFactory::FakeStreamingCall> WaitForAdsStream(
-      const XdsBootstrap::XdsServer& xds_server,
-      absl::Duration timeout = absl::Seconds(5)) {
+      const XdsBootstrap::XdsServer& xds_server) {
     return transport_factory_->WaitForStream(
-        xds_server, FakeXdsTransportFactory::kAdsMethod,
-        timeout * grpc_test_slowdown_factor());
+        xds_server, FakeXdsTransportFactory::kAdsMethod);
+  }
+
+  RefCountedPtr<FakeXdsTransportFactory::FakeStreamingCall> WaitForAdsStream() {
+    return WaitForAdsStream(*xds_client_->bootstrap().servers().front());
   }
 
   void TriggerConnectionFailure(const XdsBootstrap::XdsServer& xds_server,
@@ -796,19 +824,11 @@ class XdsClientTest : public ::testing::Test {
     transport_factory_->TriggerConnectionFailure(xds_server, std::move(status));
   }
 
-  RefCountedPtr<FakeXdsTransportFactory::FakeStreamingCall> WaitForAdsStream(
-      absl::Duration timeout = absl::Seconds(5)) {
-    return WaitForAdsStream(*xds_client_->bootstrap().servers().front(),
-                            timeout);
-  }
-
   // Gets the latest request sent to the fake xDS server.
   absl::optional<DiscoveryRequest> WaitForRequest(
       FakeXdsTransportFactory::FakeStreamingCall* stream,
-      absl::Duration timeout = absl::Seconds(3),
       SourceLocation location = SourceLocation()) {
-    auto message =
-        stream->WaitForMessageFromClient(timeout * grpc_test_slowdown_factor());
+    auto message = stream->WaitForMessageFromClient();
     if (!message.has_value()) return absl::nullopt;
     DiscoveryRequest request;
     bool success = request.ParseFromString(*message);
@@ -893,6 +913,7 @@ class XdsClientTest : public ::testing::Test {
         << location.file() << ":" << location.line();
   }
 
+  std::shared_ptr<FuzzingEventEngine> event_engine_;
   RefCountedPtr<FakeXdsTransportFactory> transport_factory_;
   RefCountedPtr<XdsClient> xds_client_;
   MetricsReporter* metrics_reporter_ = nullptr;
@@ -2011,7 +2032,7 @@ TEST_F(XdsClientTest, ResourceDeletion) {
           .set_nonce("B")
           .Serialize());
   // Watcher should see the does-not-exist event.
-  EXPECT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(1)));
+  EXPECT_TRUE(watcher->WaitForDoesNotExist());
   // Check metric data.
   EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData(
       ::testing::ElementsAre(::testing::Pair(
@@ -2029,7 +2050,7 @@ TEST_F(XdsClientTest, ResourceDeletion) {
   // Start a new watcher for the same resource.  It should immediately
   // receive the same does-not-exist notification.
   auto watcher2 = StartWildcardCapableWatch("wc1");
-  EXPECT_TRUE(watcher2->WaitForDoesNotExist(absl::Seconds(1)));
+  EXPECT_TRUE(watcher2->WaitForDoesNotExist());
   // XdsClient should have sent an ACK message to the xDS server.
   request = WaitForRequest(stream.get());
   ASSERT_TRUE(request.has_value());
@@ -2142,7 +2163,7 @@ TEST_F(XdsClientTest, ResourceDeletionIgnoredWhenConfigured) {
           .Serialize());
   // Watcher should not see any update, since we should have ignored the
   // deletion.
-  EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(1)));
+  EXPECT_TRUE(watcher->ExpectNoEvent());
   // Check metric data.
   EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData(
       ::testing::ElementsAre(::testing::Pair(
@@ -2438,7 +2459,7 @@ TEST_F(XdsClientTest, ConnectionFails) {
       ::testing::ElementsAre(::testing::Pair(kDefaultXdsServerUrl, 1))));
   // We should not see a resource-does-not-exist event, because the
   // timer should not be running while the channel is disconnected.
-  EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(4)));
+  EXPECT_TRUE(watcher->ExpectNoEvent());
   // Start a new watch.  This watcher should be given the same error,
   // since we have not yet recovered.
   auto watcher2 = StartFooWatch("foo1");
@@ -2517,7 +2538,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistUponTimeout) {
   CheckRequestNode(*request);  // Should be present on the first request.
   // Do not send a response, but wait for the resource to be reported as
   // not existing.
-  EXPECT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(5)));
+  EXPECT_TRUE(watcher->WaitForDoesNotExist());
   // Check metric data.
   EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData(
       ::testing::ElementsAre(), ::testing::ElementsAre(), ::testing::_));
@@ -2530,7 +2551,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistUponTimeout) {
   // Start a new watcher for the same resource.  It should immediately
   // receive the same does-not-exist notification.
   auto watcher2 = StartFooWatch("foo1");
-  EXPECT_TRUE(watcher2->WaitForDoesNotExist(absl::Seconds(1)));
+  EXPECT_TRUE(watcher2->WaitForDoesNotExist());
   // Now server sends a response.
   stream->SendMessageToClient(
       ResponseBuilder(XdsFooResourceType::Get()->type_url())
@@ -2641,7 +2662,7 @@ TEST_F(XdsClientTest, ResourceDoesNotExistAfterStreamRestart) {
   CheckRequestNode(*request);  // Should be present on the first request.
   // Server does NOT send a response immediately.
   // Client should receive a resource does-not-exist.
-  ASSERT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(4)));
+  ASSERT_TRUE(watcher->WaitForDoesNotExist());
   // Check metric data.
   EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData(
       ::testing::ElementsAre(), ::testing::ElementsAre(), ::testing::_));
@@ -2713,7 +2734,7 @@ TEST_F(XdsClientTest, DoesNotExistTimerNotStartedUntilSendCompletes) {
   // Server does NOT send a response.
   // We should not see a resource-does-not-exist event, because the
   // timer should not be running while the channel is disconnected.
-  EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(4)));
+  EXPECT_TRUE(watcher->ExpectNoEvent());
   // Check metric data.
   EXPECT_THAT(GetResourceCounts(),
               ::testing::ElementsAre(::testing::Pair(
@@ -2726,7 +2747,7 @@ TEST_F(XdsClientTest, DoesNotExistTimerNotStartedUntilSendCompletes) {
   stream->CompleteSendMessageFromClient();
   // Server does NOT send a response.
   // Watcher should see a does-not-exist event.
-  EXPECT_TRUE(watcher->WaitForDoesNotExist(absl::Seconds(4)));
+  EXPECT_TRUE(watcher->WaitForDoesNotExist());
   // Check metric data.
   EXPECT_THAT(GetResourceCounts(),
               ::testing::ElementsAre(::testing::Pair(
@@ -2915,7 +2936,7 @@ TEST_F(XdsClientTest,
                /*resource_names=*/{"foo1", "foo2"});
   stream->CompleteSendMessageFromClient();
   // Make sure the watcher for foo1 does not see a does-not-exist event.
-  EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(5)));
+  EXPECT_TRUE(watcher->ExpectNoEvent());
   // Cancel watches.
   CancelFooWatch(watcher.get(), "foo1", /*delay_unsubscription=*/true);
   CancelFooWatch(watcher2.get(), "foo2");
@@ -2992,7 +3013,7 @@ TEST_F(XdsClientTest, DoNotSendDoesNotExistForCachedResource) {
   // We should not see a resource-does-not-exist event, because the
   // resource was already cached, so the server can optimize by not
   // resending it.
-  EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(4)));
+  EXPECT_TRUE(watcher->ExpectNoEvent());
   // Check metric data.
   EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData(
       ::testing::ElementsAre(::testing::Pair(
@@ -3014,7 +3035,7 @@ TEST_F(XdsClientTest, DoNotSendDoesNotExistForCachedResource) {
           .AddFooResource(XdsFooResource("foo1", 6))
           .Serialize());
   // Watcher will not see any update, since the resource is unchanged.
-  EXPECT_TRUE(watcher->ExpectNoEvent(absl::Seconds(1)));
+  EXPECT_TRUE(watcher->ExpectNoEvent());
   // Check metric data.
   EXPECT_TRUE(metrics_reporter_->WaitForMetricsReporterData(
       ::testing::ElementsAre(::testing::Pair(
@@ -3504,7 +3525,7 @@ TEST_F(XdsClientTest, FederationWithUnknownAuthority) {
       << *error;
 }
 
-TEST_F(XdsClientTest, FederationWithUnparsableXdstpResourceName) {
+TEST_F(XdsClientTest, FederationWithUnparseableXdstpResourceName) {
   // Note: Not adding authority to bootstrap config.
   InitXdsClient();
   // Start a watch for the xdstp resource name.
@@ -3724,7 +3745,6 @@ TEST_F(XdsClientTest, FederationChannelFailureReportedToWatchers) {
 }
 
 TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) {
-  const absl::Duration timeout = absl::Seconds(5) * grpc_test_slowdown_factor();
   InitXdsClient();
   // Start watches for "foo1" and "foo2".
   auto watcher1 = StartFooWatch("foo1");
@@ -3777,11 +3797,11 @@ TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) {
                /*version_info=*/"1", /*response_nonce=*/"A",
                /*error_detail=*/absl::OkStatus(),
                /*resource_names=*/{"foo1", "foo2"});
-  EXPECT_TRUE(stream->WaitForReadsStarted(1, timeout));
+  EXPECT_TRUE(stream->WaitForReadsStarted(1));
   resource1->read_delay_handle.reset();
-  EXPECT_TRUE(stream->WaitForReadsStarted(1, timeout));
+  EXPECT_TRUE(stream->WaitForReadsStarted(1));
   resource2->read_delay_handle.reset();
-  EXPECT_TRUE(stream->WaitForReadsStarted(2, timeout));
+  EXPECT_TRUE(stream->WaitForReadsStarted(2));
   resource1 = watcher1->WaitForNextResourceAndHandle();
   ASSERT_NE(resource1, absl::nullopt);
   EXPECT_EQ(resource1->resource->name, "foo1");
@@ -3794,9 +3814,9 @@ TEST_F(XdsClientTest, AdsReadWaitsForHandleRelease) {
                /*version_info=*/"2", /*response_nonce=*/"B",
                /*error_detail=*/absl::OkStatus(),
                /*resource_names=*/{"foo1", "foo2"});
-  EXPECT_TRUE(stream->WaitForReadsStarted(2, timeout));
+  EXPECT_TRUE(stream->WaitForReadsStarted(2));
   resource1->read_delay_handle.reset();
-  EXPECT_TRUE(stream->WaitForReadsStarted(3, timeout));
+  EXPECT_TRUE(stream->WaitForReadsStarted(3));
   // Cancel watch.
   CancelFooWatch(watcher1.get(), "foo1");
   request = WaitForRequest(stream.get());
@@ -4185,8 +4205,5 @@ TEST_F(XdsClientTest, FallbackOnStartup) {
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   grpc::testing::TestEnvironment env(&argc, argv);
-  grpc_init();
-  int ret = RUN_ALL_TESTS();
-  grpc_shutdown();
-  return ret;
+  return RUN_ALL_TESTS();
 }
diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc
index 8c0fc5f5ea3..6369fd60c97 100644
--- a/test/core/xds/xds_transport_fake.cc
+++ b/test/core/xds/xds_transport_fake.cc
@@ -29,15 +29,12 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "test/core/test_util/test_config.h"
 
-using grpc_event_engine::experimental::GetDefaultEventEngine;
-
 namespace grpc_core {
 
 //
@@ -60,8 +57,8 @@ FakeXdsTransportFactory::FakeStreamingCall::~FakeStreamingCall() {
   // synchronously, since those operations will trigger code in
   // XdsClient that acquires its mutex, but it was already holding its
   // mutex when it called us, so it would deadlock.
-  GetDefaultEventEngine()->Run([event_handler = std::move(event_handler_),
-                                status_sent = status_sent_]() mutable {
+  event_engine_->Run([event_handler = std::move(event_handler_),
+                      status_sent = status_sent_]() mutable {
     ExecCtx exec_ctx;
     if (!status_sent) event_handler->OnStatusReceived(absl::OkStatus());
     event_handler.reset();
@@ -82,7 +79,6 @@ void FakeXdsTransportFactory::FakeStreamingCall::SendMessage(
   MutexLock lock(&mu_);
   CHECK(!orphaned_);
   from_client_messages_.push_back(std::move(payload));
-  cv_client_msg_.Signal();
   if (transport_->auto_complete_messages_from_client()) {
     CompleteSendMessageFromClientLocked(/*ok=*/true);
   }
@@ -94,18 +90,18 @@ bool FakeXdsTransportFactory::FakeStreamingCall::HaveMessageFromClient() {
 }
 
 absl::optional<std::string>
-FakeXdsTransportFactory::FakeStreamingCall::WaitForMessageFromClient(
-    absl::Duration timeout) {
-  MutexLock lock(&mu_);
-  while (from_client_messages_.empty()) {
-    if (cv_client_msg_.WaitWithTimeout(&mu_,
-                                       timeout * grpc_test_slowdown_factor())) {
-      return absl::nullopt;
+FakeXdsTransportFactory::FakeStreamingCall::WaitForMessageFromClient() {
+  while (true) {
+    event_engine_->Tick();
+    MutexLock lock(&mu_);
+    if (from_client_messages_.empty()) {
+      if (event_engine_->IsIdle()) return absl::nullopt;
+      continue;
     }
+    std::string payload = std::move(from_client_messages_.front());
+    from_client_messages_.pop_front();
+    return payload;
   }
-  std::string payload = from_client_messages_.front();
-  from_client_messages_.pop_front();
-  return payload;
 }
 
 void FakeXdsTransportFactory::FakeStreamingCall::
@@ -113,12 +109,11 @@ void FakeXdsTransportFactory::FakeStreamingCall::
   // Can't call event_handler_->OnRequestSent() synchronously, since that
   // operation will trigger code in XdsClient that acquires its mutex, but it
   // was already holding its mutex when it called us, so it would deadlock.
-  GetDefaultEventEngine()->Run(
-      [event_handler = event_handler_->Ref(), ok]() mutable {
-        ExecCtx exec_ctx;
-        event_handler->OnRequestSent(ok);
-        event_handler.reset();
-      });
+  event_engine_->Run([event_handler = event_handler_->Ref(), ok]() mutable {
+    ExecCtx exec_ctx;
+    event_handler->OnRequestSent(ok);
+    event_handler.reset();
+  });
 }
 
 void FakeXdsTransportFactory::FakeStreamingCall::CompleteSendMessageFromClient(
@@ -135,11 +130,10 @@ void FakeXdsTransportFactory::FakeStreamingCall::StartRecvMessage() {
   }
   ++reads_started_;
   ++num_pending_reads_;
-  cv_reads_started_.SignalAll();
   if (!to_client_messages_.empty()) {
     // Dispatch pending message (if there's one) on a separate thread to avoid
     // recursion
-    GetDefaultEventEngine()->Run([call = RefAsSubclass<FakeStreamingCall>()]() {
+    event_engine_->Run([call = RefAsSubclass<FakeStreamingCall>()]() {
       call->MaybeDeliverMessageToClient();
     });
   }
@@ -187,6 +181,16 @@ void FakeXdsTransportFactory::FakeStreamingCall::MaybeSendStatusToClient(
   event_handler->OnStatusReceived(std::move(status));
 }
 
+bool FakeXdsTransportFactory::FakeStreamingCall::WaitForReadsStarted(
+    size_t expected) {
+  while (true) {
+    event_engine_->Tick();
+    MutexLock lock(&mu_);
+    if (reads_started_ == expected) return true;
+    if (event_engine_->IsIdle()) return false;
+  }
+}
+
 bool FakeXdsTransportFactory::FakeStreamingCall::IsOrphaned() {
   MutexLock lock(&mu_);
   return orphaned_;
@@ -223,7 +227,7 @@ void FakeXdsTransportFactory::FakeXdsTransport::Orphaned() {
     // Can't destroy watchers synchronously, since that operation will trigger
     // code in XdsClient that acquires its mutex, but it was already holding
     // its mutex when it called us, so it would deadlock.
-    GetDefaultEventEngine()->Run([watchers = std::move(watchers_)]() mutable {
+    event_engine_->Run([watchers = std::move(watchers_)]() mutable {
       ExecCtx exec_ctx;
       watchers.clear();
     });
@@ -231,17 +235,14 @@ void FakeXdsTransportFactory::FakeXdsTransport::Orphaned() {
 }
 
 RefCountedPtr<FakeXdsTransportFactory::FakeStreamingCall>
-FakeXdsTransportFactory::FakeXdsTransport::WaitForStream(
-    const char* method, absl::Duration timeout) {
-  MutexLock lock(&mu_);
-  auto it = active_calls_.find(method);
-  while (it == active_calls_.end() || it->second == nullptr) {
-    if (cv_.WaitWithTimeout(&mu_, timeout * grpc_test_slowdown_factor())) {
-      return nullptr;
-    }
-    it = active_calls_.find(method);
+FakeXdsTransportFactory::FakeXdsTransport::WaitForStream(const char* method) {
+  while (true) {
+    event_engine_->Tick();
+    MutexLock lock(&mu_);
+    auto it = active_calls_.find(method);
+    if (it != active_calls_.end() && it->second != nullptr) return it->second;
+    if (event_engine_->IsIdle()) return nullptr;
   }
-  return it->second;
 }
 
 void FakeXdsTransportFactory::FakeXdsTransport::RemoveStream(
@@ -273,7 +274,6 @@ FakeXdsTransportFactory::FakeXdsTransport::CreateStreamingCall(
       WeakRefAsSubclass<FakeXdsTransport>(), method, std::move(event_handler));
   MutexLock lock(&mu_);
   active_calls_[method] = call->Ref().TakeAsSubclass<FakeStreamingCall>();
-  cv_.Signal();
   return call;
 }
 
@@ -318,13 +318,14 @@ void FakeXdsTransportFactory::SetAbortOnUndrainedMessages(bool value) {
 
 RefCountedPtr<FakeXdsTransportFactory::FakeStreamingCall>
 FakeXdsTransportFactory::WaitForStream(const XdsBootstrap::XdsServer& server,
-                                       const char* method,
-                                       absl::Duration timeout) {
+                                       const char* method) {
   auto transport = GetTransport(server);
   if (transport == nullptr) return nullptr;
-  return transport->WaitForStream(method, timeout);
+  return transport->WaitForStream(method);
 }
 
+void FakeXdsTransportFactory::Orphaned() { event_engine_.reset(); }
+
 RefCountedPtr<FakeXdsTransportFactory::FakeXdsTransport>
 FakeXdsTransportFactory::GetTransport(const XdsBootstrap::XdsServer& server) {
   std::string key = server.Key();
diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h
index 0eb37e8a489..ffa4c746551 100644
--- a/test/core/xds/xds_transport_fake.h
+++ b/test/core/xds/xds_transport_fake.h
@@ -40,6 +40,7 @@
 #include "src/core/util/sync.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
 namespace grpc_core {
 
@@ -61,6 +62,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
         std::unique_ptr<StreamingCall::EventHandler> event_handler)
         : transport_(std::move(transport)),
           method_(method),
+          event_engine_(transport_->factory()->event_engine_),
           event_handler_(MakeRefCounted<RefCountedEventHandler>(
               std::move(event_handler))) {}
 
@@ -75,8 +77,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
     using StreamingCall::Ref;  // Make it public.
 
     bool HaveMessageFromClient();
-    absl::optional<std::string> WaitForMessageFromClient(
-        absl::Duration timeout);
+    absl::optional<std::string> WaitForMessageFromClient();
 
     // If FakeXdsTransportFactory::SetAutoCompleteMessagesFromClient()
     // was called to set the value to false before the creation of the
@@ -88,16 +89,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
     void SendMessageToClient(absl::string_view payload);
     void MaybeSendStatusToClient(absl::Status status);
 
-    bool WaitForReadsStarted(size_t expected, absl::Duration timeout) {
-      MutexLock lock(&mu_);
-      const absl::Time deadline = absl::Now() + timeout;
-      do {
-        if (reads_started_ == expected) {
-          return true;
-        }
-      } while (!cv_reads_started_.WaitWithDeadline(&mu_, deadline));
-      return false;
-    }
+    bool WaitForReadsStarted(size_t expected);
 
    private:
     class RefCountedEventHandler : public RefCounted<RefCountedEventHandler> {
@@ -126,10 +118,10 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
 
     WeakRefCountedPtr<FakeXdsTransport> transport_;
     const char* method_;
+    std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
+        event_engine_;
 
     Mutex mu_;
-    CondVar cv_reads_started_;
-    CondVar cv_client_msg_;
     RefCountedPtr<RefCountedEventHandler> event_handler_ ABSL_GUARDED_BY(&mu_);
     std::deque<std::string> from_client_messages_ ABSL_GUARDED_BY(&mu_);
     bool status_sent_ ABSL_GUARDED_BY(&mu_) = false;
@@ -140,8 +132,11 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
   };
 
   explicit FakeXdsTransportFactory(
-      std::function<void()> too_many_pending_reads_callback)
-      : too_many_pending_reads_callback_(
+      std::function<void()> too_many_pending_reads_callback,
+      std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
+          event_engine)
+      : event_engine_(std::move(event_engine)),
+        too_many_pending_reads_callback_(
             std::move(too_many_pending_reads_callback)) {}
 
   void TriggerConnectionFailure(const XdsBootstrap::XdsServer& server,
@@ -169,10 +164,9 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
   void SetAbortOnUndrainedMessages(bool value);
 
   RefCountedPtr<FakeStreamingCall> WaitForStream(
-      const XdsBootstrap::XdsServer& server, const char* method,
-      absl::Duration timeout);
+      const XdsBootstrap::XdsServer& server, const char* method);
 
-  void Orphaned() override {}
+  void Orphaned() override;
 
  private:
   class FakeXdsTransport : public XdsTransport {
@@ -185,7 +179,8 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
           server_(server),
           auto_complete_messages_from_client_(
               auto_complete_messages_from_client),
-          abort_on_undrained_messages_(abort_on_undrained_messages) {}
+          abort_on_undrained_messages_(abort_on_undrained_messages),
+          event_engine_(factory_->event_engine_) {}
 
     void Orphaned() override;
 
@@ -199,8 +194,7 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
 
     void TriggerConnectionFailure(absl::Status status);
 
-    RefCountedPtr<FakeStreamingCall> WaitForStream(const char* method,
-                                                   absl::Duration timeout);
+    RefCountedPtr<FakeStreamingCall> WaitForStream(const char* method);
 
     void RemoveStream(const char* method, FakeStreamingCall* call);
 
@@ -224,9 +218,10 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
     const XdsBootstrap::XdsServer& server_;
     const bool auto_complete_messages_from_client_;
     const bool abort_on_undrained_messages_;
+    std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
+        event_engine_;
 
     Mutex mu_;
-    CondVar cv_;
     std::set<RefCountedPtr<ConnectivityFailureWatcher>> watchers_
         ABSL_GUARDED_BY(&mu_);
     std::map<std::string /*method*/, RefCountedPtr<FakeStreamingCall>>
@@ -244,6 +239,9 @@ class FakeXdsTransportFactory : public XdsTransportFactory {
   RefCountedPtr<FakeXdsTransport> GetTransportLocked(const std::string& key)
       ABSL_EXCLUSIVE_LOCKS_REQUIRED(&mu_);
 
+  std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
+      event_engine_;
+
   Mutex mu_;
   std::map<std::string /*XdsServer key*/, FakeXdsTransport*> transport_map_
       ABSL_GUARDED_BY(&mu_);

From b44de399c1539d793504e03573d64228ee0f4733 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Tue, 1 Oct 2024 15:21:44 -0700
Subject: [PATCH 24/74] [Chttp2Server] Remove unnecessary ExecCtx Flush
 (#37824)

This seems to be a vestige from around 8 years ago. The code has changed a lot since then, and this makes no sense anymore.

(Making this change separately to be safe.)

Closes #37824

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37824 from yashykt:RemoveUnnecessaryExecCtxStuff 97a7625033df07ce5fcd24b915d76942ba24e912
PiperOrigin-RevId: 681184980
---
 src/core/ext/transport/chttp2/server/chttp2_server.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index 212493f95f7..3ebc5758950 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -783,15 +783,11 @@ Chttp2ServerListener::Chttp2ServerListener(
 }
 
 Chttp2ServerListener::~Chttp2ServerListener() {
-  // Flush queued work before destroying handshaker factory, since that
-  // may do a synchronous unref.
-  ExecCtx::Get()->Flush();
   if (passive_listener_ != nullptr) {
     passive_listener_->ListenerDestroyed();
   }
   if (on_destroy_done_ != nullptr) {
     ExecCtx::Run(DEBUG_LOCATION, on_destroy_done_, absl::OkStatus());
-    ExecCtx::Get()->Flush();
   }
 }
 

From cd129b49c20e6eb741e291e5c6f0db9b43125a64 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 1 Oct 2024 17:20:13 -0700
Subject: [PATCH 25/74] [GCP auth filter] hold ref to service config (#37831)

This fixes the following crash:

https://btx.cloud.google.com/invocations/3a7065d4-db7f-4f01-a239-5376b7f5ee8b/targets/%2F%2Ftest%2Fcpp%2Fend2end%2Fxds:xds_gcp_authn_end2end_test@experiment%3Dwork_serializer_dispatch;config=1a7dc092b28796b045d00aec96c95b85c1d4dc656912e0021a1fc84b3ecb2ac9/log

The problem is caused by a race whereby the channel swaps out the service config due to a resolver update while the old dynamic filter stack is still processing calls in another thread.  The GCP auth filter was dereferencing the old service config but not holding a ref to it.  I've fixed this by having it hold a ref.

In the long run, I suspect that we may run into other cases like this, in which case we may want the dynamic filter stack itself to hold a ref to the service config, so that individual filters don't have to.

Closes #37831

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37831 from markdroth:gcp_auth_race_fix f2a0d1dd7921adfbb47332d50109ae612fc43240
PiperOrigin-RevId: 681221795
---
 .../gcp_authentication/gcp_authentication_filter.cc   | 11 +++++++----
 .../gcp_authentication/gcp_authentication_filter.h    |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
index 7e51b20dca3..e301ed62154 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
@@ -153,7 +153,7 @@ absl::StatusOr<std::unique_ptr<GcpAuthenticationFilter>>
 GcpAuthenticationFilter::Create(const ChannelArgs& args,
                                 ChannelFilter::Args filter_args) {
   // Get filter config.
-  auto* service_config = args.GetObject<ServiceConfig>();
+  auto service_config = args.GetObjectRef<ServiceConfig>();
   if (service_config == nullptr) {
     return absl::InvalidArgumentError(
         "gcp_auth: no service config in channel args");
@@ -184,15 +184,18 @@ GcpAuthenticationFilter::Create(const ChannelArgs& args,
   // cache but it has the wrong size.
   cache->SetMaxSize(filter_config->cache_size);
   // Instantiate filter.
-  return std::unique_ptr<GcpAuthenticationFilter>(new GcpAuthenticationFilter(
-      filter_config, std::move(xds_config), std::move(cache)));
+  return std::unique_ptr<GcpAuthenticationFilter>(
+      new GcpAuthenticationFilter(std::move(service_config), filter_config,
+                                  std::move(xds_config), std::move(cache)));
 }
 
 GcpAuthenticationFilter::GcpAuthenticationFilter(
+    RefCountedPtr<ServiceConfig> service_config,
     const GcpAuthenticationParsedConfig::Config* filter_config,
     RefCountedPtr<const XdsConfig> xds_config,
     RefCountedPtr<CallCredentialsCache> cache)
-    : filter_config_(filter_config),
+    : service_config_(std::move(service_config)),
+      filter_config_(filter_config),
       xds_config_(std::move(xds_config)),
       cache_(std::move(cache)) {}
 
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
index f8fc704c9e8..a3136ebd460 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
@@ -80,10 +80,14 @@ class GcpAuthenticationFilter
   };
 
   GcpAuthenticationFilter(
+      RefCountedPtr<ServiceConfig> service_config,
       const GcpAuthenticationParsedConfig::Config* filter_config,
       RefCountedPtr<const XdsConfig> xds_config,
       RefCountedPtr<CallCredentialsCache> cache);
 
+  // TODO(roth): Consider having the channel stack hold this ref so that
+  // individual filters don't need to.
+  const RefCountedPtr<ServiceConfig> service_config_;
   const GcpAuthenticationParsedConfig::Config* filter_config_;
   const RefCountedPtr<const XdsConfig> xds_config_;
   const RefCountedPtr<CallCredentialsCache> cache_;

From d6fd0bd9919695b2047a66910628fb9b36145fa0 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 1 Oct 2024 17:44:44 -0700
Subject: [PATCH 26/74] [chaotic-good] Annotate key promises for latent-see
 (#37830)

Closes #37830

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37830 from ctiller:promising-latent-see 4f7dd1b7c60abe83f32c520d0d6106c04df9b27e
PiperOrigin-RevId: 681228010
---
 .../chaotic_good/client_transport.cc          |  84 +++++-----
 .../chaotic_good/server_transport.cc          | 152 +++++++++---------
 .../posix_engine/posix_endpoint.cc            |   2 +-
 src/core/lib/transport/promise_endpoint.h     |  77 ++++-----
 src/core/util/latent_see.h                    |  20 ++-
 5 files changed, 187 insertions(+), 148 deletions(-)

diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc
index 28af0d5ba98..29a39c1fbac 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good/client_transport.cc
@@ -117,7 +117,9 @@ auto ChaoticGoodClientTransport::PushFrameIntoCall(ServerFragmentFrame frame,
       });
   // Wrap the actual sequence with something that owns the call handler so that
   // its lifetime extends until the push completes.
-  return [call_handler, push = std::move(push)]() mutable { return push(); };
+  return GRPC_LATENT_SEE_PROMISE(
+      "PushFrameIntoCall",
+      ([call_handler, push = std::move(push)]() mutable { return push(); }));
 }
 
 auto ChaoticGoodClientTransport::TransportReadLoop(
@@ -205,11 +207,15 @@ ChaoticGoodClientTransport::ChaoticGoodClientTransport(
   party_arena->SetContext<grpc_event_engine::experimental::EventEngine>(
       event_engine.get());
   party_ = Party::Make(std::move(party_arena));
-  party_->Spawn("client-chaotic-writer", TransportWriteLoop(transport),
+  party_->Spawn("client-chaotic-writer",
+                GRPC_LATENT_SEE_PROMISE("ClientTransportWriteLoop",
+                                        TransportWriteLoop(transport)),
                 OnTransportActivityDone("write_loop"));
-  party_->Spawn("client-chaotic-reader",
-                TransportReadLoop(std::move(transport)),
-                OnTransportActivityDone("read_loop"));
+  party_->Spawn(
+      "client-chaotic-reader",
+      GRPC_LATENT_SEE_PROMISE("ClientTransportReadLoop",
+                              TransportReadLoop(std::move(transport))),
+      OnTransportActivityDone("read_loop"));
 }
 
 ChaoticGoodClientTransport::~ChaoticGoodClientTransport() { party_.reset(); }
@@ -265,38 +271,42 @@ auto ChaoticGoodClientTransport::CallOutboundLoop(uint32_t stream_id,
                  return absl::OkStatus();
                });
   };
-  return TrySeq(
-      // Wait for initial metadata then send it out.
-      call_handler.PullClientInitialMetadata(),
-      [send_fragment](ClientMetadataHandle md) mutable {
-        GRPC_TRACE_LOG(chaotic_good, INFO)
-            << "CHAOTIC_GOOD: Sending initial metadata: " << md->DebugString();
-        ClientFragmentFrame frame;
-        frame.headers = std::move(md);
-        return send_fragment(std::move(frame));
-      },
-      // Continuously send client frame with client to server messages.
-      ForEach(OutgoingMessages(call_handler),
-              [send_fragment,
-               aligned_bytes = aligned_bytes_](MessageHandle message) mutable {
-                ClientFragmentFrame frame;
-                // Construct frame header (flags, header_length and
-                // trailer_length will be added in serialization).
-                const uint32_t message_length = message->payload()->Length();
-                const uint32_t padding =
-                    message_length % aligned_bytes == 0
-                        ? 0
-                        : aligned_bytes - message_length % aligned_bytes;
-                CHECK_EQ((message_length + padding) % aligned_bytes, 0u);
-                frame.message = FragmentMessage(std::move(message), padding,
-                                                message_length);
-                return send_fragment(std::move(frame));
-              }),
-      [send_fragment]() mutable {
-        ClientFragmentFrame frame;
-        frame.end_of_stream = true;
-        return send_fragment(std::move(frame));
-      });
+  return GRPC_LATENT_SEE_PROMISE(
+      "CallOutboundLoop",
+      TrySeq(
+          // Wait for initial metadata then send it out.
+          call_handler.PullClientInitialMetadata(),
+          [send_fragment](ClientMetadataHandle md) mutable {
+            GRPC_TRACE_LOG(chaotic_good, INFO)
+                << "CHAOTIC_GOOD: Sending initial metadata: "
+                << md->DebugString();
+            ClientFragmentFrame frame;
+            frame.headers = std::move(md);
+            return send_fragment(std::move(frame));
+          },
+          // Continuously send client frame with client to server messages.
+          ForEach(OutgoingMessages(call_handler),
+                  [send_fragment, aligned_bytes = aligned_bytes_](
+                      MessageHandle message) mutable {
+                    ClientFragmentFrame frame;
+                    // Construct frame header (flags, header_length and
+                    // trailer_length will be added in serialization).
+                    const uint32_t message_length =
+                        message->payload()->Length();
+                    const uint32_t padding =
+                        message_length % aligned_bytes == 0
+                            ? 0
+                            : aligned_bytes - message_length % aligned_bytes;
+                    CHECK_EQ((message_length + padding) % aligned_bytes, 0u);
+                    frame.message = FragmentMessage(std::move(message), padding,
+                                                    message_length);
+                    return send_fragment(std::move(frame));
+                  }),
+          [send_fragment]() mutable {
+            ClientFragmentFrame frame;
+            frame.end_of_stream = true;
+            return send_fragment(std::move(frame));
+          }));
 }
 
 void ChaoticGoodClientTransport::StartCall(CallHandler call_handler) {
diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index 6588227a264..492dee5c843 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -199,25 +199,27 @@ auto ChaoticGoodServerTransport::SendCallInitialMetadataAndBody(
 auto ChaoticGoodServerTransport::CallOutboundLoop(
     uint32_t stream_id, CallInitiator call_initiator) {
   auto outgoing_frames = outgoing_frames_.MakeSender();
-  return Seq(
-      Map(SendCallInitialMetadataAndBody(stream_id, outgoing_frames,
-                                         call_initiator),
-          [stream_id](absl::Status main_body_result) {
-            GRPC_TRACE_VLOG(chaotic_good, 2)
-                << "CHAOTIC_GOOD: CallOutboundLoop: stream_id=" << stream_id
-                << " main_body_result=" << main_body_result;
-            return Empty{};
-          }),
-      call_initiator.PullServerTrailingMetadata(),
-      // Capture the call_initator to ensure the underlying call_spine
-      // is alive until the SendFragment promise completes.
-      [stream_id, outgoing_frames,
-       call_initiator](ServerMetadataHandle md) mutable {
-        ServerFragmentFrame frame;
-        frame.trailers = std::move(md);
-        frame.stream_id = stream_id;
-        return SendFragment(std::move(frame), outgoing_frames, call_initiator);
-      });
+  return GRPC_LATENT_SEE_PROMISE(
+      "CallOutboundLoop",
+      Seq(Map(SendCallInitialMetadataAndBody(stream_id, outgoing_frames,
+                                             call_initiator),
+              [stream_id](absl::Status main_body_result) {
+                GRPC_TRACE_VLOG(chaotic_good, 2)
+                    << "CHAOTIC_GOOD: CallOutboundLoop: stream_id=" << stream_id
+                    << " main_body_result=" << main_body_result;
+                return Empty{};
+              }),
+          call_initiator.PullServerTrailingMetadata(),
+          // Capture the call_initator to ensure the underlying call_spine
+          // is alive until the SendFragment promise completes.
+          [stream_id, outgoing_frames,
+           call_initiator](ServerMetadataHandle md) mutable {
+            ServerFragmentFrame frame;
+            frame.trailers = std::move(md);
+            frame.stream_id = stream_id;
+            return SendFragment(std::move(frame), outgoing_frames,
+                                call_initiator);
+          }));
 }
 
 auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToNewCall(
@@ -269,57 +271,59 @@ auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToExistingCall(
 }
 
 auto ChaoticGoodServerTransport::ReadOneFrame(ChaoticGoodTransport& transport) {
-  return TrySeq(
-      transport.ReadFrameBytes(),
-      [this, transport =
-                 &transport](std::tuple<FrameHeader, BufferPair> frame_bytes) {
-        const auto& frame_header = std::get<0>(frame_bytes);
-        auto& buffers = std::get<1>(frame_bytes);
-        return Switch(
-            frame_header.type,
-            Case(FrameType::kSettings,
-                 []() -> absl::Status {
-                   return absl::InternalError("Unexpected settings frame");
-                 }),
-            Case(FrameType::kFragment,
-                 [this, &frame_header, &buffers, transport]() {
-                   return If(
-                       frame_header.flags.is_set(0),
-                       [this, &frame_header, &buffers, transport]() {
-                         return DeserializeAndPushFragmentToNewCall(
-                             frame_header, std::move(buffers), *transport);
-                       },
-                       [this, &frame_header, &buffers, transport]() {
-                         return DeserializeAndPushFragmentToExistingCall(
-                             frame_header, std::move(buffers), *transport);
-                       });
-                 }),
-            Case(FrameType::kCancel,
-                 [this, &frame_header]() {
-                   absl::optional<CallInitiator> call_initiator =
-                       ExtractStream(frame_header.stream_id);
-                   GRPC_TRACE_LOG(chaotic_good, INFO)
-                       << "Cancel stream " << frame_header.stream_id
-                       << (call_initiator.has_value() ? " (active)"
-                                                      : " (not found)");
-                   return If(
-                       call_initiator.has_value(),
-                       [&call_initiator]() {
-                         auto c = std::move(*call_initiator);
-                         return c.SpawnWaitable("cancel", [c]() mutable {
-                           c.Cancel();
-                           return absl::OkStatus();
-                         });
-                       },
-                       []() -> absl::Status { return absl::OkStatus(); });
-                 }),
-            Default([frame_header]() {
-              return absl::InternalError(
-                  absl::StrCat("Unexpected frame type: ",
-                               static_cast<uint8_t>(frame_header.type)));
-            }));
-      },
-      []() -> LoopCtl<absl::Status> { return Continue{}; });
+  return GRPC_LATENT_SEE_PROMISE(
+      "ReadOneFrame",
+      TrySeq(
+          transport.ReadFrameBytes(),
+          [this, transport = &transport](
+              std::tuple<FrameHeader, BufferPair> frame_bytes) {
+            const auto& frame_header = std::get<0>(frame_bytes);
+            auto& buffers = std::get<1>(frame_bytes);
+            return Switch(
+                frame_header.type,
+                Case(FrameType::kSettings,
+                     []() -> absl::Status {
+                       return absl::InternalError("Unexpected settings frame");
+                     }),
+                Case(FrameType::kFragment,
+                     [this, &frame_header, &buffers, transport]() {
+                       return If(
+                           frame_header.flags.is_set(0),
+                           [this, &frame_header, &buffers, transport]() {
+                             return DeserializeAndPushFragmentToNewCall(
+                                 frame_header, std::move(buffers), *transport);
+                           },
+                           [this, &frame_header, &buffers, transport]() {
+                             return DeserializeAndPushFragmentToExistingCall(
+                                 frame_header, std::move(buffers), *transport);
+                           });
+                     }),
+                Case(FrameType::kCancel,
+                     [this, &frame_header]() {
+                       absl::optional<CallInitiator> call_initiator =
+                           ExtractStream(frame_header.stream_id);
+                       GRPC_TRACE_LOG(chaotic_good, INFO)
+                           << "Cancel stream " << frame_header.stream_id
+                           << (call_initiator.has_value() ? " (active)"
+                                                          : " (not found)");
+                       return If(
+                           call_initiator.has_value(),
+                           [&call_initiator]() {
+                             auto c = std::move(*call_initiator);
+                             return c.SpawnWaitable("cancel", [c]() mutable {
+                               c.Cancel();
+                               return absl::OkStatus();
+                             });
+                           },
+                           []() -> absl::Status { return absl::OkStatus(); });
+                     }),
+                Default([frame_header]() {
+                  return absl::InternalError(
+                      absl::StrCat("Unexpected frame type: ",
+                                   static_cast<uint8_t>(frame_header.type)));
+                }));
+          },
+          []() -> LoopCtl<absl::Status> { return Continue{}; }));
 }
 
 auto ChaoticGoodServerTransport::TransportReadLoop(
@@ -360,9 +364,13 @@ ChaoticGoodServerTransport::ChaoticGoodServerTransport(
   party_arena->SetContext<grpc_event_engine::experimental::EventEngine>(
       event_engine.get());
   party_ = Party::Make(std::move(party_arena));
-  party_->Spawn("server-chaotic-writer", TransportWriteLoop(transport),
+  party_->Spawn("server-chaotic-writer",
+                GRPC_LATENT_SEE_PROMISE("ServerTransportWriteLoop",
+                                        TransportWriteLoop(transport)),
                 OnTransportActivityDone("writer"));
-  party_->Spawn("server-chaotic-reader", TransportReadLoop(transport),
+  party_->Spawn("server-chaotic-reader",
+                GRPC_LATENT_SEE_PROMISE("ServerTransportReadLoop",
+                                        TransportReadLoop(transport)),
                 OnTransportActivityDone("reader"));
 }
 
diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
index c603f940359..bf6a78bb23c 100644
--- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
@@ -102,7 +102,7 @@ namespace {
 // of bytes sent.
 ssize_t TcpSend(int fd, const struct msghdr* msg, int* saved_errno,
                 int additional_flags = 0) {
-  GRPC_LATENT_SEE_INNER_SCOPE("TcpSend");
+  GRPC_LATENT_SEE_PARENT_SCOPE("TcpSend");
   ssize_t sent_length;
   do {
     sent_length = sendmsg(fd, msg, SENDMSG_FLAGS | additional_flags);
diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h
index 077a1a01f70..0e69b82f7a1 100644
--- a/src/core/lib/transport/promise_endpoint.h
+++ b/src/core/lib/transport/promise_endpoint.h
@@ -106,24 +106,25 @@ class PromiseEndpoint {
             return absl::OkStatus();
           };
         },
-        [this]() {
-          return [write_state = write_state_]() -> Poll<absl::Status> {
-            // If current write isn't finished return `Pending()`, else
-            // return write result.
-            WriteState::State expected = WriteState::kWritten;
-            if (write_state->state.compare_exchange_strong(
-                    expected, WriteState::kIdle, std::memory_order_acquire,
-                    std::memory_order_relaxed)) {
-              // State was Written, and we changed it to Idle. We can return
-              // the result.
-              return std::move(write_state->result);
-            }
-            // State was not Written; since we're polling it must be
-            // Writing. Assert that and return Pending.
-            CHECK(expected == WriteState::kWriting);
-            return Pending();
-          };
-        });
+        GRPC_LATENT_SEE_PROMISE(
+            "DelayedWrite", ([this]() {
+              return [write_state = write_state_]() -> Poll<absl::Status> {
+                // If current write isn't finished return `Pending()`, else
+                // return write result.
+                WriteState::State expected = WriteState::kWritten;
+                if (write_state->state.compare_exchange_strong(
+                        expected, WriteState::kIdle, std::memory_order_acquire,
+                        std::memory_order_relaxed)) {
+                  // State was Written, and we changed it to Idle. We can return
+                  // the result.
+                  return std::move(write_state->result);
+                }
+                // State was not Written; since we're polling it must be
+                // Writing. Assert that and return Pending.
+                CHECK(expected == WriteState::kWriting);
+                return Pending();
+              };
+            })));
   }
 
   // Returns a promise that resolves to `SliceBuffer` with
@@ -174,25 +175,27 @@ class PromiseEndpoint {
             return std::move(ret);
           };
         },
-        [this, num_bytes]() {
-          return [read_state = read_state_,
-                  num_bytes]() -> Poll<absl::StatusOr<SliceBuffer>> {
-            if (!read_state->complete.load(std::memory_order_acquire)) {
-              return Pending();
-            }
-            // If read succeeds, return `SliceBuffer` with `num_bytes` bytes.
-            if (read_state->result.ok()) {
-              SliceBuffer ret;
-              grpc_slice_buffer_move_first_no_inline(
-                  read_state->buffer.c_slice_buffer(), num_bytes,
-                  ret.c_slice_buffer());
-              read_state->complete.store(false, std::memory_order_relaxed);
-              return std::move(ret);
-            }
-            read_state->complete.store(false, std::memory_order_relaxed);
-            return std::move(read_state->result);
-          };
-        });
+        GRPC_LATENT_SEE_PROMISE(
+            "DelayedRead", ([this, num_bytes]() {
+              return [read_state = read_state_,
+                      num_bytes]() -> Poll<absl::StatusOr<SliceBuffer>> {
+                if (!read_state->complete.load(std::memory_order_acquire)) {
+                  return Pending();
+                }
+                // If read succeeds, return `SliceBuffer` with `num_bytes`
+                // bytes.
+                if (read_state->result.ok()) {
+                  SliceBuffer ret;
+                  grpc_slice_buffer_move_first_no_inline(
+                      read_state->buffer.c_slice_buffer(), num_bytes,
+                      ret.c_slice_buffer());
+                  read_state->complete.store(false, std::memory_order_relaxed);
+                  return std::move(ret);
+                }
+                read_state->complete.store(false, std::memory_order_relaxed);
+                return std::move(read_state->result);
+              };
+            })));
   }
 
   // Returns a promise that resolves to `Slice` with at least
diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h
index cf22a40ed8e..1ace01110a6 100644
--- a/src/core/util/latent_see.h
+++ b/src/core/util/latent_see.h
@@ -252,12 +252,26 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) {
   Log::CurrentThreadBin()->Append(md, EventType::kMark, 0);
 }
 
+template <typename P>
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION auto Promise(const Metadata* md_poll,
+                                                  const Metadata* md_flow,
+                                                  P promise) {
+  return [md_poll, md_flow, promise = std::move(promise),
+          flow = Flow(md_flow)]() mutable {
+    InnerScope scope(md_poll);
+    flow.End();
+    auto r = promise();
+    flow.Begin(md_flow);
+    return r;
+  };
+}
+
 }  // namespace latent_see
 }  // namespace grpc_core
 #define GRPC_LATENT_SEE_METADATA(name)                                     \
   []() {                                                                   \
     static grpc_core::latent_see::Metadata metadata = {__FILE__, __LINE__, \
-                                                       #name};             \
+                                                       name};              \
     return &metadata;                                                      \
   }()
 // Parent scope: logs a begin and end event, and flushes the thread log on scope
@@ -277,6 +291,9 @@ GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void Mark(const Metadata* md) {
 // scope.
 #define GRPC_LATENT_SEE_MARK(name) \
   grpc_core::latent_see::Mark(GRPC_LATENT_SEE_METADATA(name))
+#define GRPC_LATENT_SEE_PROMISE(name, promise)                           \
+  grpc_core::latent_see::Promise(GRPC_LATENT_SEE_METADATA("Poll:" name), \
+                                 GRPC_LATENT_SEE_METADATA(name), promise)
 #else  // !def(GRPC_ENABLE_LATENT_SEE)
 namespace grpc_core {
 namespace latent_see {
@@ -305,6 +322,7 @@ struct InnerScope {
 #define GRPC_LATENT_SEE_MARK(name) \
   do {                             \
   } while (0)
+#define GRPC_LATENT_SEE_PROMISE(name, promise) promise
 #endif  // GRPC_ENABLE_LATENT_SEE
 
 #endif  // GRPC_SRC_CORE_UTIL_LATENT_SEE_H

From 863aca8949c02c244c8fd7dea3a1f9c087c4f110 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 1 Oct 2024 18:13:27 -0700
Subject: [PATCH 27/74] [call-v3] Implement failed_before_recv_message() on
 {Client,Server}Call (#37810)

Closes #37810

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37810 from ctiller:CANCELLED 134f49a07b242dc2eaa924e784f9b6d48378c1d4
PiperOrigin-RevId: 681236011
---
 src/core/lib/surface/client_call.h     |  4 +++-
 src/core/lib/surface/server_call.h     |  4 +++-
 src/core/lib/transport/call_filters.h  |  7 +++++++
 src/core/lib/transport/call_spine.h    |  8 ++++++++
 src/core/lib/transport/call_state.h    | 23 +++++++++++++++++++++++
 src/core/util/dump_args.h              | 13 +++++++++----
 test/core/transport/call_state_test.cc |  6 ++++++
 7 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h
index 014eafed11d..8180c273ba2 100644
--- a/src/core/lib/surface/client_call.h
+++ b/src/core/lib/surface/client_call.h
@@ -98,7 +98,9 @@ class ClientCall final
   char* GetPeer() override;
 
   bool Completed() final { Crash("unimplemented"); }
-  bool failed_before_recv_message() const final { Crash("unimplemented"); }
+  bool failed_before_recv_message() const final {
+    return started_call_initiator_.WasCancelledPushed();
+  }
 
   grpc_compression_algorithm incoming_compression_algorithm() override {
     return message_receiver_.incoming_compression_algorithm();
diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h
index b8e4299731b..dcc9d86606e 100644
--- a/src/core/lib/surface/server_call.h
+++ b/src/core/lib/surface/server_call.h
@@ -129,7 +129,9 @@ class ServerCall final : public Call, public DualRefCounted<ServerCall> {
   }
 
   bool Completed() final { Crash("unimplemented"); }
-  bool failed_before_recv_message() const final { Crash("unimplemented"); }
+  bool failed_before_recv_message() const final {
+    return call_handler_.WasCancelledPushed();
+  }
 
   uint32_t test_only_message_flags() override {
     return message_receiver_.last_message_flags();
diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h
index b1a54f5dfec..01d4c7614de 100644
--- a/src/core/lib/transport/call_filters.h
+++ b/src/core/lib/transport/call_filters.h
@@ -1590,10 +1590,17 @@ class CallFilters {
   GRPC_MUST_USE_RESULT auto WasCancelled() {
     return [this]() { return call_state_.PollWasCancelled(); };
   }
+  // Client & server: returns true if server trailing metadata has been pushed
+  // *and* contained a cancellation, false otherwise.
+  GRPC_MUST_USE_RESULT bool WasCancelledPushed() const {
+    return call_state_.WasCancelledPushed();
+  }
+
   // Returns true if server trailing metadata has been pulled
   bool WasServerTrailingMetadataPulled() const {
     return call_state_.WasServerTrailingMetadataPulled();
   }
+
   // Client & server: fill in final_info with the final status of the call.
   void Finalize(const grpc_call_final_info* final_info);
 
diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h
index 6e8e20146be..c3d5687b971 100644
--- a/src/core/lib/transport/call_spine.h
+++ b/src/core/lib/transport/call_spine.h
@@ -263,6 +263,10 @@ class CallInitiator {
     return spine_->SpawnWaitable(name, std::move(promise_factory));
   }
 
+  bool WasCancelledPushed() const {
+    return spine_->call_filters().WasCancelledPushed();
+  }
+
   Arena* arena() { return spine_->arena(); }
   Party* party() { return spine_.get(); }
 
@@ -304,6 +308,10 @@ class CallHandler {
 
   auto WasCancelled() { return spine_->WasCancelled(); }
 
+  bool WasCancelledPushed() const {
+    return spine_->call_filters().WasCancelledPushed();
+  }
+
   template <typename PromiseFactory>
   void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory,
                     DebugLocation whence = {}) {
diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h
index d741c541f2f..33eca5e66b4 100644
--- a/src/core/lib/transport/call_state.h
+++ b/src/core/lib/transport/call_state.h
@@ -52,8 +52,14 @@ class CallState {
   Poll<ValueOrFailure<bool>> PollPullServerToClientMessageAvailable();
   void FinishPullServerToClientMessage();
   Poll<Empty> PollServerTrailingMetadataAvailable();
+  void FinishPullServerTrailingMetadata();
   bool WasServerTrailingMetadataPulled() const;
+  // Resolves after server trailing metadata has been pulled, to true if the
+  // call was cancelled, and false otherwise.
   Poll<bool> PollWasCancelled();
+  // Return true if server trailing metadata has been pushed *and* that push was
+  // a cancellation.
+  bool WasCancelledPushed() const;
   // Debug
   std::string DebugString() const;
 
@@ -939,6 +945,23 @@ CallState::PollWasCancelled() {
   Crash("Unreachable");
 }
 
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline bool CallState::WasCancelledPushed()
+    const {
+  GRPC_TRACE_LOG(call_state, INFO)
+      << "[call_state] PollWasCancelledPushed: "
+      << GRPC_DUMP_ARGS(this, server_trailing_metadata_state_);
+  switch (server_trailing_metadata_state_) {
+    case ServerTrailingMetadataState::kNotPushed:
+    case ServerTrailingMetadataState::kPulled:
+    case ServerTrailingMetadataState::kPushed:
+      return false;
+    case ServerTrailingMetadataState::kPushedCancel:
+    case ServerTrailingMetadataState::kPulledCancel:
+      return true;
+  }
+  Crash("Unreachable");
+}
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
diff --git a/src/core/util/dump_args.h b/src/core/util/dump_args.h
index 02519075c36..da923e4f060 100644
--- a/src/core/util/dump_args.h
+++ b/src/core/util/dump_args.h
@@ -78,20 +78,25 @@ class DumpArgs {
     return 0;
   }
 
-  int AddDumper(void** p) {
+  int AddDumper(void const* const* p) {
     arg_dumpers_.push_back(
         [p](CustomSink& os) { os.Append(absl::StrFormat("%p", *p)); });
     return 0;
   }
 
   template <typename T>
-  int AddDumper(T** p) {
-    return AddDumper(reinterpret_cast<void**>(p));
+  int AddDumper(T const* const* p) {
+    return AddDumper(reinterpret_cast<void const* const*>(p));
   }
 
   template <typename T>
   int AddDumper(T* const* p) {
-    return AddDumper(const_cast<T**>(p));
+    return AddDumper(const_cast<T const* const*>(p));
+  }
+
+  template <typename T>
+  int AddDumper(T const** p) {
+    return AddDumper(const_cast<T const* const*>(p));
   }
 
   void Stringify(CustomSink& sink) const;
diff --git a/test/core/transport/call_state_test.cc b/test/core/transport/call_state_test.cc
index c8dcca2825b..fcdf91b2818 100644
--- a/test/core/transport/call_state_test.cc
+++ b/test/core/transport/call_state_test.cc
@@ -262,11 +262,14 @@ TEST(CallStateTest, RecallNoCancellation) {
   activity.Activate();
   CallState state;
   state.Start();
+  EXPECT_EQ(state.WasCancelledPushed(), false);
   state.PushServerTrailingMetadata(false);
+  EXPECT_EQ(state.WasCancelledPushed(), false);
   EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false));
   state.FinishPullServerInitialMetadata();
   EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady());
   EXPECT_THAT(state.PollWasCancelled(), IsReady(false));
+  EXPECT_EQ(state.WasCancelledPushed(), false);
 }
 
 TEST(CallStateTest, RecallCancellation) {
@@ -274,11 +277,14 @@ TEST(CallStateTest, RecallCancellation) {
   activity.Activate();
   CallState state;
   state.Start();
+  EXPECT_EQ(state.WasCancelledPushed(), false);
   state.PushServerTrailingMetadata(true);
+  EXPECT_EQ(state.WasCancelledPushed(), true);
   EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady(false));
   state.FinishPullServerInitialMetadata();
   EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady());
   EXPECT_THAT(state.PollWasCancelled(), IsReady(true));
+  EXPECT_EQ(state.WasCancelledPushed(), true);
 }
 
 TEST(CallStateTest, ReceiveTrailingMetadataAfterMessageRead) {

From adc7affc2d84c5c932158e903596415d3e1a6742 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 1 Oct 2024 18:14:17 -0700
Subject: [PATCH 28/74] [resource-quota] Add metrics for number of calls,
 connections dropped due to quota exceeded (#37833)

Closes #37833

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37833 from ctiller:statty f0499160867d52d4d18b679497749ae7c2a6cd86
PiperOrigin-RevId: 681236201
---
 .../transport/chttp2/transport/chttp2_transport.cc  |  2 ++
 src/core/telemetry/stats_data.cc                    | 13 +++++++++++++
 src/core/telemetry/stats_data.h                     | 13 +++++++++++++
 src/core/telemetry/stats_data.yaml                  |  5 +++++
 4 files changed, 33 insertions(+)

diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index e4b0b1fdf25..4087efcf6dd 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -3110,6 +3110,7 @@ static void benign_reclaimer_locked(
   if (error.ok() && t->stream_map.empty()) {
     // Channel with no active streams: send a goaway to try and make it
     // disconnect cleanly
+    grpc_core::global_stats().IncrementRqConnectionsDropped();
     GRPC_TRACE_LOG(resource_quota, INFO)
         << "HTTP2: " << t->peer_string.as_string_view()
         << " - send goaway to free memory";
@@ -3139,6 +3140,7 @@ static void destructive_reclaimer_locked(
     GRPC_TRACE_LOG(resource_quota, INFO)
         << "HTTP2: " << t->peer_string.as_string_view()
         << " - abandon stream id " << s->id;
+    grpc_core::global_stats().IncrementRqCallsDropped();
     grpc_chttp2_cancel_stream(
         t.get(), s,
         grpc_error_set_int(GRPC_ERROR_CREATE("Buffers full"),
diff --git a/src/core/telemetry/stats_data.cc b/src/core/telemetry/stats_data.cc
index b39702f4762..a357b674844 100644
--- a/src/core/telemetry/stats_data.cc
+++ b/src/core/telemetry/stats_data.cc
@@ -128,6 +128,8 @@ const absl::string_view
         "client_subchannels_created",
         "server_channels_created",
         "insecure_connections_created",
+        "rq_connections_dropped",
+        "rq_calls_dropped",
         "syscall_write",
         "syscall_read",
         "tcp_read_alloc_8k",
@@ -165,6 +167,8 @@ const absl::string_view GlobalStats::counter_doc[static_cast<int>(
     "Number of client subchannels created",
     "Number of server channels created",
     "Number of insecure connections created",
+    "Number of connections dropped due to resource quota exceeded",
+    "Number of calls dropped due to resource quota exceeded",
     "Number of write syscalls (or equivalent - eg sendmsg) made by this "
     "process",
     "Number of read syscalls (or equivalent - eg recvmsg) made by this process",
@@ -464,6 +468,8 @@ GlobalStats::GlobalStats()
       client_subchannels_created{0},
       server_channels_created{0},
       insecure_connections_created{0},
+      rq_connections_dropped{0},
+      rq_calls_dropped{0},
       syscall_write{0},
       syscall_read{0},
       tcp_read_alloc_8k{0},
@@ -601,6 +607,10 @@ std::unique_ptr<GlobalStats> GlobalStatsCollector::Collect() const {
         data.server_channels_created.load(std::memory_order_relaxed);
     result->insecure_connections_created +=
         data.insecure_connections_created.load(std::memory_order_relaxed);
+    result->rq_connections_dropped +=
+        data.rq_connections_dropped.load(std::memory_order_relaxed);
+    result->rq_calls_dropped +=
+        data.rq_calls_dropped.load(std::memory_order_relaxed);
     result->syscall_write += data.syscall_write.load(std::memory_order_relaxed);
     result->syscall_read += data.syscall_read.load(std::memory_order_relaxed);
     result->tcp_read_alloc_8k +=
@@ -716,6 +726,9 @@ std::unique_ptr<GlobalStats> GlobalStats::Diff(const GlobalStats& other) const {
       server_channels_created - other.server_channels_created;
   result->insecure_connections_created =
       insecure_connections_created - other.insecure_connections_created;
+  result->rq_connections_dropped =
+      rq_connections_dropped - other.rq_connections_dropped;
+  result->rq_calls_dropped = rq_calls_dropped - other.rq_calls_dropped;
   result->syscall_write = syscall_write - other.syscall_write;
   result->syscall_read = syscall_read - other.syscall_read;
   result->tcp_read_alloc_8k = tcp_read_alloc_8k - other.tcp_read_alloc_8k;
diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h
index d0e7e5fd267..1ac7579a994 100644
--- a/src/core/telemetry/stats_data.h
+++ b/src/core/telemetry/stats_data.h
@@ -206,6 +206,8 @@ struct GlobalStats {
     kClientSubchannelsCreated,
     kServerChannelsCreated,
     kInsecureConnectionsCreated,
+    kRqConnectionsDropped,
+    kRqCallsDropped,
     kSyscallWrite,
     kSyscallRead,
     kTcpReadAlloc8k,
@@ -283,6 +285,8 @@ struct GlobalStats {
       uint64_t client_subchannels_created;
       uint64_t server_channels_created;
       uint64_t insecure_connections_created;
+      uint64_t rq_connections_dropped;
+      uint64_t rq_calls_dropped;
       uint64_t syscall_write;
       uint64_t syscall_read;
       uint64_t tcp_read_alloc_8k;
@@ -373,6 +377,13 @@ class GlobalStatsCollector {
     data_.this_cpu().insecure_connections_created.fetch_add(
         1, std::memory_order_relaxed);
   }
+  void IncrementRqConnectionsDropped() {
+    data_.this_cpu().rq_connections_dropped.fetch_add(
+        1, std::memory_order_relaxed);
+  }
+  void IncrementRqCallsDropped() {
+    data_.this_cpu().rq_calls_dropped.fetch_add(1, std::memory_order_relaxed);
+  }
   void IncrementSyscallWrite() {
     data_.this_cpu().syscall_write.fetch_add(1, std::memory_order_relaxed);
   }
@@ -562,6 +573,8 @@ class GlobalStatsCollector {
     std::atomic<uint64_t> client_subchannels_created{0};
     std::atomic<uint64_t> server_channels_created{0};
     std::atomic<uint64_t> insecure_connections_created{0};
+    std::atomic<uint64_t> rq_connections_dropped{0};
+    std::atomic<uint64_t> rq_calls_dropped{0};
     std::atomic<uint64_t> syscall_write{0};
     std::atomic<uint64_t> syscall_read{0};
     std::atomic<uint64_t> tcp_read_alloc_8k{0};
diff --git a/src/core/telemetry/stats_data.yaml b/src/core/telemetry/stats_data.yaml
index 6b1f04878d0..c9580cded0b 100644
--- a/src/core/telemetry/stats_data.yaml
+++ b/src/core/telemetry/stats_data.yaml
@@ -32,6 +32,11 @@
   doc: Number of server channels created
 - counter: insecure_connections_created
   doc: Number of insecure connections created
+# resource quota
+- counter: rq_connections_dropped
+  doc: Number of connections dropped due to resource quota exceeded
+- counter: rq_calls_dropped
+  doc: Number of calls dropped due to resource quota exceeded
 # tcp
 - counter: syscall_write
   doc: Number of write syscalls (or equivalent - eg sendmsg) made by this process

From d87165acf4c401ce1d71c8276ea4e975e685362c Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Wed, 2 Oct 2024 12:33:26 -0700
Subject: [PATCH 29/74] [chttp2_server] Fix race between connection starting
 and it being orphaned (#37683)

Sample race - https://btx.cloud.google.com/invocations/0c4e65f2-3a38-4b4f-b67e-c53a4a4650ea/targets/%2F%2Ftest%2Fcore%2Fend2end:connectivity_test@poller%3Dpoll;config=2aed862ff4fd4384687d63aa95df415c7cb955355c2ab6dc6c6d7a9d123a76ec/log

```
WARNING: ThreadSanitizer: data race (pid=18)
  Write of size 8 at 0x72300000c318 by thread T29:
    #0 grpc_core::Chttp2ServerListener* std::__exchange(grpc_core::Chttp2ServerListener*&, grpc_core::Chttp2ServerListener*&) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/move.h:152:13 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x68c85)
    #1 grpc_core::Chttp2ServerListener* std::exchange(grpc_core::Chttp2ServerListener*&, grpc_core::Chttp2ServerListener*&) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/utility:287:14 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x68c05)
    #2 grpc_core::RefCountedPtr::reset(grpc_core::Chttp2ServerListener*) /proc/self/cwd/./src/core/lib/gprpp/ref_counted_ptr.h:126:20 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x68b32)
    #3 grpc_core::RefCountedPtr::operator=(grpc_core::RefCountedPtr&&) /proc/self/cwd/./src/core/lib/gprpp/ref_counted_ptr.h:66:5 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x54380)
    #4 grpc_core::Chttp2ServerListener::ActiveConnection::Start(grpc_core::RefCountedPtr, std::unique_ptr, grpc_core::ChannelArgs const&) /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:615:13 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x48914)
    #5 grpc_core::Chttp2ServerListener::OnAccept(void*, grpc_endpoint*, grpc_pollset*, grpc_tcp_server_acceptor*) /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:881:21 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x49ce2)
    #6 CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const /proc/self/cwd/src/core/lib/iomgr/tcp_server_posix.cc:228:11 (liblibiomgr.so+0xef627)
    #7 decltype(std::declval()(std::declval>>(), std::declval())) absl::lts_20240116::base_internal::Callable::Invoke>, grpc_event_engine::experimental::MemoryAllocator>(CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2&, std::unique_ptr>&&, grpc_event_engine::experimental::MemoryAllocator&&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:185:12 (liblibiomgr.so+0xef3c2)
    #8 decltype(Invoker>, grpc_event_engine::experimental::MemoryAllocator>::type::Invoke(std::declval(), std::declval>>(), std::declval())) absl::lts_20240116::base_internal::invoke>, grpc_event_engine::experimental::MemoryAllocator>(CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2&, std::unique_ptr>&&, grpc_event_engine::experimental::MemoryAllocator&&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:212:10 (liblibiomgr.so+0xef325)
    #9 void absl::lts_20240116::internal_any_invocable::InvokeR>, grpc_event_engine::experimental::MemoryAllocator, void>(CreateEventEngineListener(grpc_tcp_server*, grpc_closure*, grpc_event_engine::experimental::EndpointConfig const&, grpc_tcp_server**)::$_2&, std::unique_ptr>&&, grpc_event_engine::experimental::MemoryAllocator&&) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:132:3 (liblibiomgr.so+0xef2b5)
    #10 void absl::lts_20240116::internal_any_invocable::LocalInvoker>, grpc_event_engine::experimental::MemoryAllocator>(absl::lts_20240116::internal_any_invocable::TypeErasedState*, absl::lts_20240116::internal_any_invocable::ForwardedParameter>>::type, absl::lts_20240116::internal_any_invocable::ForwardedParameter::type) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:310:10 (liblibiomgr.so+0xef1e2)
    #11 absl::lts_20240116::internal_any_invocable::Impl>, grpc_event_engine::experimental::MemoryAllocator)>::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:868:1 (libsrc_Score_Slibposix_Uevent_Uengine.so+0xa754f)
    #12 grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()::operator()() /proc/self/cwd/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc:61:15 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27cdb)
    #13 decltype(std::declval>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>()()) absl::lts_20240116::base_internal::Callable::Invoke>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>(grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:185:12 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27c45)
    #14 decltype(Invoker>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>::type::Invoke(std::declval>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>())) absl::lts_20240116::base_internal::invoke>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>(grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&) /proc/self/cwd/external/com_google_absl/absl/base/internal/invoke.h:212:10 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27bf5)
    #15 void absl::lts_20240116::internal_any_invocable::InvokeR>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&, void>(grpc_event_engine::experimental::ThreadyEventEngine::CreateListener(absl::lts_20240116::AnyInvocable>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:132:3 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x27ba5)
    #16 void absl::lts_20240116::internal_any_invocable::RemoteInvoker>, grpc_event_engine::experimental::MemoryAllocator)>, absl::lts_20240116::AnyInvocable, grpc_event_engine::experimental::EndpointConfig const&, std::unique_ptr>)::$_0::operator()(std::unique_ptr>, grpc_event_engine::experimental::MemoryAllocator) const::'lambda'()&>(absl::lts_20240116::internal_any_invocable::TypeErasedState*) /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:368:10 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x279cd)
    #17 absl::lts_20240116::internal_any_invocable::Impl::operator()() /proc/self/cwd/external/com_google_absl/absl/functional/internal/any_invocable.h:868:1 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x337ff)
    #18 grpc_core::Thread::Thread(char const*, absl::lts_20240116::AnyInvocable, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::operator()(void*) const /proc/self/cwd/./src/core/lib/gprpp/thd.h:108:15 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x2e264)
    #19 grpc_core::Thread::Thread(char const*, absl::lts_20240116::AnyInvocable, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::__invoke(void*) /proc/self/cwd/./src/core/lib/gprpp/thd.h:105:13 (libsrc_Score_Slibthready_Uevent_Uengine.so+0x2e1e9)
    #20 grpc_core::(anonymous namespace)::ThreadInternalsPosix::ThreadInternalsPosix(char const*, void (*)(void*), void*, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::operator()(void*) const /proc/self/cwd/src/core/lib/gprpp/posix/thd.cc:148:11 (liblibgpr.so+0x1d830)
    #21 grpc_core::(anonymous namespace)::ThreadInternalsPosix::ThreadInternalsPosix(char const*, void (*)(void*), void*, bool*, grpc_core::Thread::Options const&)::'lambda'(void*)::__invoke(void*) /proc/self/cwd/src/core/lib/gprpp/posix/thd.cc:118:9 (liblibgpr.so+0x1d659)

  Previous read of size 8 at 0x72300000c318 by main thread:
    #0 grpc_core::RefCountedPtr::operator!=(std::nullptr_t) const /proc/self/cwd/./src/core/lib/gprpp/ref_counted_ptr.h:192:50 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x52345)
    #1 grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:394:30 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x463ed)
    #2 std::enable_if::value, grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*>::type grpc_event_engine::experimental::MemoryAllocator::New, grpc_pollset*&, std::unique_ptr, grpc_core::ChannelArgs const&>(grpc_core::RefCountedPtr&&, grpc_pollset*&, std::unique_ptr&&, grpc_core::ChannelArgs const&)::Wrapper::~Wrapper() /proc/self/cwd/include/grpc/event_engine/memory_allocator.h:117:65 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x67a1c)
    #3 std::enable_if::value, grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*>::type grpc_event_engine::experimental::MemoryAllocator::New, grpc_pollset*&, std::unique_ptr, grpc_core::ChannelArgs const&>(grpc_core::RefCountedPtr&&, grpc_pollset*&, std::unique_ptr&&, grpc_core::ChannelArgs const&)::Wrapper::~Wrapper() /proc/self/cwd/include/grpc/event_engine/memory_allocator.h:117:27 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x67a59)
    #4 void grpc_core::UnrefDelete::operator()(grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*) const /proc/self/cwd/./src/core/lib/gprpp/ref_counted.h:224:5 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x6449d)
    #5 grpc_core::InternallyRefCounted::Unref() /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:132:7 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x52581)
    #6 grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:407:3 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x466ac)
    #7 void grpc_core::OrphanableDelete::operator()(grpc_core::Chttp2ServerListener::ActiveConnection::HandshakingState*) /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:60:8 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x653b1)
    #8 std::unique_ptr::~unique_ptr() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/unique_ptr.h:292:4 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x53ddf)
    #9 grpc_core::Chttp2ServerListener::ActiveConnection::Orphan() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:581:1 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x487db)
    #10 void grpc_core::OrphanableDelete::operator()(grpc_core::Chttp2ServerListener::ActiveConnection*) /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:60:8 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x66b01)
    #11 std::unique_ptr::~unique_ptr() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/unique_ptr.h:292:4 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x53d1f)
    #12 std::pair>::~pair() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_pair.h:208:12 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x597f9)
    #13 void __gnu_cxx::new_allocator>>>::destroy>>(std::pair>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/ext/new_allocator.h:152:10 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x597c1)
    #14 void std::allocator_traits>>>>::destroy>>(std::allocator>>>&, std::pair>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/alloc_traits.h:496:8 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x59725)
    #15 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::_M_destroy_node(std::_Rb_tree_node>>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:642:2 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x59674)
    #16 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::_M_drop_node(std::_Rb_tree_node>>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:650:2 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x595f9)
    #17 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::_M_erase(std::_Rb_tree_node>>*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:1920:4 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x5945f)
    #18 std::_Rb_tree>, std::_Select1st>>, std::less, std::allocator>>>::~_Rb_tree() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_tree.h:1000:9 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x593c5)
    #19 std::map, std::less, std::allocator>>>::~map() /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/stl_map.h:300:22 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x51525)
    #20 grpc_core::Chttp2ServerListener::Orphan() /proc/self/cwd/src/core/ext/transport/chttp2/server/chttp2_server.cc:923:1 (libsrc_Score_Slibgrpc_Utransport_Uchttp2_Userver.so+0x4b5dd)
    #21 void grpc_core::OrphanableDelete::operator()(grpc_core::Server::ListenerInterface*) /proc/self/cwd/./src/core/lib/gprpp/orphanable.h:60:8 (libsrc_Score_Slibchaotic_Ugood_Userver.so+0x1d0981)
    #22 std::unique_ptr::reset(grpc_core::Server::ListenerInterface*) /usr/lib/gcc/x86_64-linux-gnu/9/../../../../include/c++/9/bits/unique_ptr.h:402:4 (liblibserver.so+0x1d5c21)
    #23 grpc_core::Server::StopListening() /proc/self/cwd/src/core/server/server.cc:1211:23 (liblibserver.so+0x1b9c62)
    #24 grpc_core::Server::ShutdownAndNotify(grpc_completion_queue*, void*) /proc/self/cwd/src/core/server/server.cc:1195:3 (liblibserver.so+0x1b97da)
    #25 grpc_server_shutdown_and_notify /proc/self/cwd/src/core/server/server.cc:1829:37 (liblibserver.so+0x1bf212)
    #26 grpc_core::CoreEnd2endTest::ShutdownServerAndNotify(int) /proc/self/cwd/./test/core/end2end/end2end_tests.h:459:5 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x33370)
    #27 grpc_core::(anonymous namespace)::CoreEnd2endTest_RetryHttp2Test_ConnectivityWatch::RunTest() /proc/self/cwd/test/core/end2end/tests/connectivity.cc:74:3 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x2ee8d)
    #28 grpc_core::(anonymous namespace)::CoreEnd2endTest_RetryHttp2Test_ConnectivityWatch::TestBody() /proc/self/cwd/test/core/end2end/tests/connectivity.cc:32:1 (libtest_Score_Send2end_Slibconnectivity_Ulibrary.so+0x2dc96)
    #29 void testing::internal::HandleSehExceptionsInMethodIfSupported(testing::Test*, void (testing::Test::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2612:10 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x16d2dc)
    #30 void testing::internal::HandleExceptionsInMethodIfSupported(testing::Test*, void (testing::Test::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2648:14 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x14a51d)
    #31 testing::Test::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2687:5 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x120458)
    #32 testing::TestInfo::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2836:11 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x1215f3)
    #33 testing::TestSuite::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:3015:30 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x12230c)
    #34 testing::internal::UnitTestImpl::RunAllTests() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:5921:44 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x138142)
    #35 bool testing::internal::HandleSehExceptionsInMethodIfSupported(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2612:10 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x17508f)
    #36 bool testing::internal::HandleExceptionsInMethodIfSupported(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:2648:14 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x14e5b3)
    #37 testing::UnitTest::Run() /proc/self/cwd/external/com_google_googletest/googletest/src/gtest.cc:5485:10 (libexternal_Scom_Ugoogle_Ugoogletest_Slibgtest.so+0x13795b)
    #38 RUN_ALL_TESTS() /proc/self/cwd/external/com_google_googletest/googletest/include/gtest/gtest.h:2316:73 (libtest_Score_Send2end_Slibend2end_Utest_Umain.so+0x8457)
    #39 main /proc/self/cwd/test/core/end2end/end2end_test_main.cc:50:10 (libtest_Score_Send2end_Slibend2end_Utest_Umain.so+0x77b6)
```

We start the connection outside the critical region and that's where we supply the listener ref to the connection. There is a freak case where the connection can be orphaned due to the listener stopping to serve and the `Orphan()` would also be trying to access the listener ref resulting in a race.

Closes #37683

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37683 from yashykt:FixChttp2ServerRace e3c452984f9c2fa0b9ea425fbd8b58d285d1fc5f
PiperOrigin-RevId: 681552145
---
 .../transport/chttp2/server/chttp2_server.cc  | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index 3ebc5758950..ac0562c4117 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -207,7 +207,8 @@ class Chttp2ServerListener : public Server::ListenerInterface {
       grpc_pollset_set* const interested_parties_;
     };
 
-    ActiveConnection(grpc_pollset* accepting_pollset, AcceptorPtr acceptor,
+    ActiveConnection(RefCountedPtr<Chttp2ServerListener> listener,
+                     grpc_pollset* accepting_pollset, AcceptorPtr acceptor,
                      EventEngine* event_engine, const ChannelArgs& args,
                      MemoryOwner memory_owner);
 
@@ -215,8 +216,7 @@ class Chttp2ServerListener : public Server::ListenerInterface {
 
     void SendGoAway();
 
-    void Start(RefCountedPtr<Chttp2ServerListener> listener,
-               OrphanablePtr<grpc_endpoint> endpoint, const ChannelArgs& args);
+    void Start(OrphanablePtr<grpc_endpoint> endpoint, const ChannelArgs& args);
 
     // Needed to be able to grab an external ref in
     // Chttp2ServerListener::OnAccept()
@@ -228,6 +228,9 @@ class Chttp2ServerListener : public Server::ListenerInterface {
 
     RefCountedPtr<Chttp2ServerListener> listener_;
     Mutex mu_ ABSL_ACQUIRED_AFTER(&listener_->mu_);
+    // Was ActiveConnection::Start() invoked? Used to determine whether
+    // tcp_server needs to be unreffed.
+    bool connection_started_ ABSL_GUARDED_BY(&mu_) = false;
     // Set by HandshakingState before the handshaking begins and reset when
     // handshaking is done.
     OrphanablePtr<HandshakingState> handshaking_state_ ABSL_GUARDED_BY(&mu_);
@@ -390,11 +393,16 @@ Chttp2ServerListener::ActiveConnection::HandshakingState::HandshakingState(
 }
 
 Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() {
+  bool connection_started = false;
+  {
+    MutexLock lock(&connection_->mu_);
+    connection_started = connection_->connection_started_;
+  }
   if (accepting_pollset_ != nullptr) {
     grpc_pollset_set_del_pollset(interested_parties_, accepting_pollset_);
   }
   grpc_pollset_set_destroy(interested_parties_);
-  if (connection_->listener_ != nullptr &&
+  if (connection_started && connection_->listener_ != nullptr &&
       connection_->listener_->tcp_server_ != nullptr) {
     grpc_tcp_server_unref(connection_->listener_->tcp_server_);
   }
@@ -566,10 +574,12 @@ void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone(
 //
 
 Chttp2ServerListener::ActiveConnection::ActiveConnection(
+    RefCountedPtr<Chttp2ServerListener> listener,
     grpc_pollset* accepting_pollset, AcceptorPtr acceptor,
     EventEngine* event_engine, const ChannelArgs& args,
     MemoryOwner memory_owner)
-    : handshaking_state_(memory_owner.MakeOrphanable<HandshakingState>(
+    : listener_(std::move(listener)),
+      handshaking_state_(memory_owner.MakeOrphanable<HandshakingState>(
           Ref(), accepting_pollset, std::move(acceptor), args)),
       event_engine_(event_engine) {
   GRPC_CLOSURE_INIT(&on_close_, ActiveConnection::OnClose, this,
@@ -626,12 +636,11 @@ void Chttp2ServerListener::ActiveConnection::SendGoAway() {
 }
 
 void Chttp2ServerListener::ActiveConnection::Start(
-    RefCountedPtr<Chttp2ServerListener> listener,
     OrphanablePtr<grpc_endpoint> endpoint, const ChannelArgs& args) {
-  listener_ = std::move(listener);
   RefCountedPtr<HandshakingState> handshaking_state_ref;
   {
     MutexLock lock(&mu_);
+    connection_started_ = true;
     // If the Connection is already shutdown at this point, it implies the
     // owning Chttp2ServerListener and all associated ActiveConnections have
     // been orphaned.
@@ -863,34 +872,32 @@ void Chttp2ServerListener::OnAccept(void* arg, grpc_endpoint* tcp,
   auto memory_owner = self->memory_quota_->CreateMemoryOwner();
   EventEngine* const event_engine = self->args_.GetObject<EventEngine>();
   auto connection = memory_owner.MakeOrphanable<ActiveConnection>(
-      accepting_pollset, std::move(acceptor), event_engine, args,
-      std::move(memory_owner));
+      self->RefAsSubclass<Chttp2ServerListener>(), accepting_pollset,
+      std::move(acceptor), event_engine, args, std::move(memory_owner));
   // Hold a ref to connection to allow starting handshake outside the
   // critical region
   RefCountedPtr<ActiveConnection> connection_ref = connection->Ref();
-  RefCountedPtr<Chttp2ServerListener> listener_ref;
   {
     MutexLock lock(&self->mu_);
     // Shutdown the the connection if listener's stopped serving or if the
     // connection manager has changed.
     if (!self->shutdown_ && self->is_serving_ &&
         connection_manager == self->connection_manager_) {
-      // The ref for both the listener and tcp_server need to be taken in the
-      // critical region after having made sure that the listener has not been
-      // Orphaned, so as to avoid heap-use-after-free issues where `Ref()` is
-      // invoked when the listener is already shutdown. Note that the listener
-      // holds a ref to the tcp_server but this ref is given away when the
-      // listener is orphaned (shutdown). A connection needs the tcp_server to
-      // outlast the handshake since the acceptor needs it.
+      // The ref for the tcp_server needs to be taken in the critical region
+      // after having made sure that the listener has not been Orphaned, so as
+      // to avoid heap-use-after-free issues where `Ref()` is invoked when the
+      // listener is already shutdown. Note that the listener holds a ref to the
+      // tcp_server but this ref is given away when the listener is orphaned
+      // (shutdown). A connection needs the tcp_server to outlast the handshake
+      // since the acceptor needs it.
       if (self->tcp_server_ != nullptr) {
         grpc_tcp_server_ref(self->tcp_server_);
       }
-      listener_ref = self->RefAsSubclass<Chttp2ServerListener>();
       self->connections_.emplace(connection.get(), std::move(connection));
     }
   }
-  if (connection == nullptr && listener_ref != nullptr) {
-    connection_ref->Start(std::move(listener_ref), std::move(endpoint), args);
+  if (connection == nullptr) {
+    connection_ref->Start(std::move(endpoint), args);
   }
 }
 

From 7c7a979ab278303fc65df747de4519a1282f440f Mon Sep 17 00:00:00 2001
From: Kukki <16548543+AlienCookie@users.noreply.github.com>
Date: Wed, 2 Oct 2024 12:41:23 -0700
Subject: [PATCH 30/74] Added static Type method to some credential types
 (#37795)

* grpc_google_default_channel_credentials
* TlsServerCredentials
* grpc_alts(_server)_credentials
* UrlExternalAccountCredentials
* FileExternalAccountCredentials
* AwsExternalAccountCredentials

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37795

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37795 from AlienCookie:patch-1 34ffa5eca5d3520c7127c10c0f1e66144e0595a1
PiperOrigin-RevId: 681554756
---
 .../lib/security/credentials/alts/alts_credentials.cc     | 4 ++--
 src/core/lib/security/credentials/alts/alts_credentials.h | 8 ++++++--
 .../external/aws_external_account_credentials.cc          | 2 +-
 .../external/aws_external_account_credentials.h           | 4 +++-
 .../external/file_external_account_credentials.cc         | 2 +-
 .../external/file_external_account_credentials.h          | 4 +++-
 .../external/url_external_account_credentials.cc          | 2 +-
 .../external/url_external_account_credentials.h           | 4 +++-
 .../google_default/google_default_credentials.cc          | 3 +--
 .../google_default/google_default_credentials.h           | 4 +++-
 src/core/lib/security/credentials/tls/tls_credentials.cc  | 2 +-
 src/core/lib/security/credentials/tls/tls_credentials.h   | 4 +++-
 12 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc
index fd8c364c26a..45888d0e808 100644
--- a/src/core/lib/security/credentials/alts/alts_credentials.cc
+++ b/src/core/lib/security/credentials/alts/alts_credentials.cc
@@ -54,7 +54,7 @@ grpc_alts_credentials::create_security_connector(
       this->Ref(), std::move(call_creds), target_name);
 }
 
-grpc_core::UniqueTypeName grpc_alts_credentials::type() const {
+grpc_core::UniqueTypeName grpc_alts_credentials::Type() {
   static grpc_core::UniqueTypeName::Factory kFactory("Alts");
   return kFactory.Create();
 }
@@ -80,7 +80,7 @@ grpc_alts_server_credentials::~grpc_alts_server_credentials() {
   gpr_free(handshaker_service_url_);
 }
 
-grpc_core::UniqueTypeName grpc_alts_server_credentials::type() const {
+grpc_core::UniqueTypeName grpc_alts_server_credentials::Type() {
   static grpc_core::UniqueTypeName::Factory kFactory("Alts");
   return kFactory.Create();
 }
diff --git a/src/core/lib/security/credentials/alts/alts_credentials.h b/src/core/lib/security/credentials/alts/alts_credentials.h
index 3aa072789ff..c998c05210f 100644
--- a/src/core/lib/security/credentials/alts/alts_credentials.h
+++ b/src/core/lib/security/credentials/alts/alts_credentials.h
@@ -43,7 +43,9 @@ class grpc_alts_credentials final : public grpc_channel_credentials {
       grpc_core::RefCountedPtr<grpc_call_credentials> call_creds,
       const char* target_name, grpc_core::ChannelArgs* args) override;
 
-  grpc_core::UniqueTypeName type() const override;
+  static grpc_core::UniqueTypeName Type();
+
+  grpc_core::UniqueTypeName type() const override { return Type(); }
 
   const grpc_alts_credentials_options* options() const { return options_; }
   grpc_alts_credentials_options* mutable_options() { return options_; }
@@ -70,7 +72,9 @@ class grpc_alts_server_credentials final : public grpc_server_credentials {
   grpc_core::RefCountedPtr<grpc_server_security_connector>
   create_security_connector(const grpc_core::ChannelArgs& /* args */) override;
 
-  grpc_core::UniqueTypeName type() const override;
+  static grpc_core::UniqueTypeName Type();
+
+  grpc_core::UniqueTypeName type() const override { return Type(); }
 
   const grpc_alts_credentials_options* options() const { return options_; }
   grpc_alts_credentials_options* mutable_options() { return options_; }
diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
index 23061f1679a..3348e3c5aba 100644
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
@@ -512,7 +512,7 @@ std::string AwsExternalAccountCredentials::debug_string() {
                       ")");
 }
 
-UniqueTypeName AwsExternalAccountCredentials::type() const {
+UniqueTypeName AwsExternalAccountCredentials::Type() {
   static UniqueTypeName::Factory kFactory("AwsExternalAccountCredentials");
   return kFactory.Create();
 }
diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h
index 466094cbe23..3ccac92ad7a 100644
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h
@@ -51,7 +51,9 @@ class AwsExternalAccountCredentials final : public ExternalAccountCredentials {
 
   std::string debug_string() override;
 
-  UniqueTypeName type() const override;
+  static UniqueTypeName Type();
+
+  UniqueTypeName type() const override { return Type(); }
 
  private:
   // A FetchBody impl that itself performs a sequence of FetchBody operations.
diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc
index c38adc83dc6..6c8e1f06062 100644
--- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc
@@ -157,7 +157,7 @@ std::string FileExternalAccountCredentials::debug_string() {
                       ")");
 }
 
-UniqueTypeName FileExternalAccountCredentials::type() const {
+UniqueTypeName FileExternalAccountCredentials::Type() {
   static UniqueTypeName::Factory kFactory("FileExternalAccountCredentials");
   return kFactory.Create();
 }
diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h
index 7d4721a0bf4..093f0a02809 100644
--- a/src/core/lib/security/credentials/external/file_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h
@@ -46,7 +46,9 @@ class FileExternalAccountCredentials final : public ExternalAccountCredentials {
 
   std::string debug_string() override;
 
-  UniqueTypeName type() const override;
+  static UniqueTypeName Type();
+
+  UniqueTypeName type() const override { return Type(); }
 
  private:
   class FileFetchBody final : public FetchBody {
diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc
index bcea5eadc09..39efb91d8f3 100644
--- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc
@@ -137,7 +137,7 @@ std::string UrlExternalAccountCredentials::debug_string() {
                       ")");
 }
 
-UniqueTypeName UrlExternalAccountCredentials::type() const {
+UniqueTypeName UrlExternalAccountCredentials::Type() {
   static UniqueTypeName::Factory kFactory("UrlExternalAccountCredentials");
   return kFactory.Create();
 }
diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h
index bf44736edf6..d7a28777d2d 100644
--- a/src/core/lib/security/credentials/external/url_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h
@@ -50,7 +50,9 @@ class UrlExternalAccountCredentials final : public ExternalAccountCredentials {
 
   std::string debug_string() override;
 
-  UniqueTypeName type() const override;
+  static UniqueTypeName Type();
+
+  UniqueTypeName type() const override { return Type(); }
 
  private:
   OrphanablePtr<FetchBody> RetrieveSubjectToken(
diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
index ba9aeca2942..6581194e911 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
@@ -162,8 +162,7 @@ grpc_google_default_channel_credentials::update_arguments(
   return args.SetIfUnset(GRPC_ARG_DNS_ENABLE_SRV_QUERIES, true);
 }
 
-grpc_core::UniqueTypeName grpc_google_default_channel_credentials::type()
-    const {
+grpc_core::UniqueTypeName grpc_google_default_channel_credentials::Type() {
   static grpc_core::UniqueTypeName::Factory kFactory("GoogleDefault");
   return kFactory.Create();
 }
diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h
index 58f9ae40cdc..889aebde57b 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.h
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h
@@ -65,7 +65,9 @@ class grpc_google_default_channel_credentials
 
   grpc_core::ChannelArgs update_arguments(grpc_core::ChannelArgs args) override;
 
-  grpc_core::UniqueTypeName type() const override;
+  static grpc_core::UniqueTypeName Type();
+
+  grpc_core::UniqueTypeName type() const override { return Type(); }
 
   const grpc_channel_credentials* alts_creds() const {
     return alts_creds_.get();
diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc
index 765f669e5ce..5fd5abf419e 100644
--- a/src/core/lib/security/credentials/tls/tls_credentials.cc
+++ b/src/core/lib/security/credentials/tls/tls_credentials.cc
@@ -145,7 +145,7 @@ TlsServerCredentials::create_security_connector(
       CreateTlsServerSecurityConnector(this->Ref(), options_);
 }
 
-grpc_core::UniqueTypeName TlsServerCredentials::type() const {
+grpc_core::UniqueTypeName TlsServerCredentials::Type() {
   static grpc_core::UniqueTypeName::Factory kFactory("Tls");
   return kFactory.Create();
 }
diff --git a/src/core/lib/security/credentials/tls/tls_credentials.h b/src/core/lib/security/credentials/tls/tls_credentials.h
index fd78967d8f5..a22cd428657 100644
--- a/src/core/lib/security/credentials/tls/tls_credentials.h
+++ b/src/core/lib/security/credentials/tls/tls_credentials.h
@@ -62,7 +62,9 @@ class TlsServerCredentials final : public grpc_server_credentials {
   grpc_core::RefCountedPtr<grpc_server_security_connector>
   create_security_connector(const grpc_core::ChannelArgs& /* args */) override;
 
-  grpc_core::UniqueTypeName type() const override;
+  static grpc_core::UniqueTypeName Type();
+
+  grpc_core::UniqueTypeName type() const override { return Type(); }
 
   grpc_tls_credentials_options* options() const { return options_.get(); }
 

From a422c8ffe3e57040fa47bb6c5579e50967d41775 Mon Sep 17 00:00:00 2001
From: Yousuk Seung <ysseung@google.com>
Date: Wed, 2 Oct 2024 15:16:10 -0700
Subject: [PATCH 31/74] [experiments] retry work_serializer_dispatch with posix
 (#37839)

All known flakes/bugs have been fixed.

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37839

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37839 from yousukseung:work_serializer_dispatch a82a068ebfd5d5f19c014e68321829f7c9216332
PiperOrigin-RevId: 681609545
---
 bazel/experiments.bzl                   | 16 ++++++----------
 src/core/lib/experiments/experiments.cc |  2 +-
 src/core/lib/experiments/experiments.h  |  3 ++-
 src/core/lib/experiments/rollouts.yaml  |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 0709155657e..830d4a076d2 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -138,10 +138,6 @@ EXPERIMENTS = {
             "core_end2end_test": [
                 "event_engine_client",
                 "local_connector_secure",
-                "work_serializer_dispatch",
-            ],
-            "cpp_end2end_test": [
-                "work_serializer_dispatch",
             ],
             "endpoint_test": [
                 "tcp_frame_size_tuning",
@@ -155,16 +151,10 @@ EXPERIMENTS = {
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
             ],
-            "lb_unit_test": [
-                "work_serializer_dispatch",
-            ],
             "resource_quota_test": [
                 "free_large_allocator",
                 "unconstrained_max_quota_buffer_size",
             ],
-            "xds_end2end_test": [
-                "work_serializer_dispatch",
-            ],
         },
         "on": {
             "cancel_ares_query_test": [
@@ -172,6 +162,10 @@ EXPERIMENTS = {
             ],
             "core_end2end_test": [
                 "event_engine_listener",
+                "work_serializer_dispatch",
+            ],
+            "cpp_end2end_test": [
+                "work_serializer_dispatch",
             ],
             "cpp_lb_end2end_test": [
                 "pick_first_new",
@@ -181,12 +175,14 @@ EXPERIMENTS = {
             ],
             "lb_unit_test": [
                 "pick_first_new",
+                "work_serializer_dispatch",
             ],
             "resolver_component_tests_runner_invoker": [
                 "event_engine_dns",
             ],
             "xds_end2end_test": [
                 "pick_first_new",
+                "work_serializer_dispatch",
             ],
         },
     },
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index 7a6522410d7..8464f0756a0 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -462,7 +462,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
      true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
-     additional_constraints_work_serializer_dispatch, nullptr, 0, false, true},
+     additional_constraints_work_serializer_dispatch, nullptr, 0, true, true},
 };
 
 }  // namespace grpc_core
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index ca6c0734a81..8aa59e12f9b 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -155,7 +155,8 @@ inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
 inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
-inline bool IsWorkSerializerDispatchEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
+inline bool IsWorkSerializerDispatchEnabled() { return true; }
 #endif
 
 #else
diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml
index 36ef43d8b40..eb86f1d851e 100644
--- a/src/core/lib/experiments/rollouts.yaml
+++ b/src/core/lib/experiments/rollouts.yaml
@@ -112,6 +112,6 @@
   default:
     # TODO(ysseung): Not fully tested.
     ios: broken
-    posix: false
+    posix: true
     # TODO(ysseung): Test flakes not fully resolved.
     windows: broken

From 14d15834b96fef8158a08be1145bac5481ed7408 Mon Sep 17 00:00:00 2001
From: Sourabh Singh <sourabhsinghs@google.com>
Date: Thu, 3 Oct 2024 08:26:30 -0700
Subject: [PATCH 32/74] [grpc][Python][doc] Added CONTRIBUTING.md to guide new
 contributors through the process of contributing to gRPC Python (#36749)

This PR introduces a new CONTRIBUTING.md file to the gRPC Python repository. The goal of this document is to provide clear and comprehensive guidelines for new contributors who are interested in contributing to the project.

- **Code of Conduct**: Establishes expectations for respectful and inclusive interactions within the community.
- **Guidelines**: Offers advice and best practices for contributing effectively, including how to find issues, get started with the codebase, and follow the project's standards.
- **Ways to Contribute**: Highlights the diverse ways in which people can contribute beyond just code, including documentation, community support, and testing.
- **Steps to Contributing**: Provides a step-by-step guide on how to set up a development environment, make changes, run tests, and submit a pull request.
- **Code Style**: Outlines the coding conventions and tools used in the project to ensure consistency.

Closes #36749

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36749 from sourabhsinghs:documentation/python-contributing-guide bcd11237420ab1a54455624f9a251aeea757f997
PiperOrigin-RevId: 681889662
---
 src/python/CONTRIBUTING.md | 92 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 src/python/CONTRIBUTING.md

diff --git a/src/python/CONTRIBUTING.md b/src/python/CONTRIBUTING.md
new file mode 100644
index 00000000000..9e92b6679c5
--- /dev/null
+++ b/src/python/CONTRIBUTING.md
@@ -0,0 +1,92 @@
+# Contributing to gRPC Python
+We're thrilled you're interested in contributing to gRPC Python!  Our vibrant community is the heart of this project. Your expertise and ideas are invaluable, so join us in shaping the future of gRPC Python.
+
+## Legal Requirements
+**Sign the CLA:** Before your PR can be reviewed, you'll need to sign the [CNCF Contributor License Agreement (CLA)](https://identity.linuxfoundation.org/projects/cncf).
+
+## Community Code of Conduct
+gRPC Python follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
+
+
+## Guidelines
+gRPC Python Follows [gRPC Guidelines for Pull Requests](https://github.com/grpc/grpc/blob/master/CONTRIBUTING.md#guidelines-for-pull-requests)
+
+## There are many ways to contribute!
+
+* **Code:** Fix bugs, add new features, or improve existing code.
+* **Documentation:** Improve tutorials, guides, or API reference documentation.
+* **Community:** Answer questions on forums, help triage issues, or write blog posts.
+* **Testing:** Help ensure the quality of gRPC Python by writing tests or reporting bugs.
+
+
+## Writing Your First Patch for gRPC Python
+
+Ready to dive in?  We'll walk you through the entire process of making your first contribution, from identifying an issue to submitting your changes for review. Don't worry if you're new to open source – our documentation and helpful community will ensure a smooth experience.
+
+### Prerequisites
+
+* **Git:** You should have Git installed on your system. If not, download and install it from the [official Git website](https://git-scm.com/).
+* **GitHub Account:** You'll need a GitHub account to fork the repository and submit pull requests. 
+* **Python:** You should have a good understanding of Python programming. If you're new to Python, there are many resources available online to get you started. You can find the official documentation on the [Python website](https://www.python.org/doc/).
+* **gRPC Concepts:** Familiarize yourself with the basics of gRPC, including concepts like protocol buffers, services, clients, and servers. Refer to the [gRPC documentation](https://grpc.io/docs/) for an overview.
+* **Bazel:** Bazel is one of the build systems used for gRPC. To install it, follow the instructions for your operating system on the [Bazel website](https://bazel.build/install).
+
+### Steps to Contributing to gRPC Python
+
+1. **Find an Issue:**
+   * **Browse Open Issues:** Look for issues labeled "[help wanted](https://github.com/grpc/grpc/issues?q=is%3Aopen+label%3A%22disposition%2Fhelp+wanted%22)" on the [gRPC Python issue tracker](https://github.com/grpc/grpc/issues?q=is%3Aissue+is%3Aopen+label%3Alang%2Fpython+sort%3Aupdated-desc).
+   * **Ask for Help:** If you're unsure where to start or need clarification on an issue, feel free to ask questions on the [gRPC forum](https://groups.google.com/g/grpc-io).
+2. **Get a Copy of the gRPC Python Development Version:**
+   * **Fork:**  Click the "Fork" button on the top right of the [gRPC repository page](https://github.com/grpc/grpc) to create a copy of the repository under your GitHub account.
+   * **Clone your fork:**
+   ```git clone https://github.com/<your-username>/grpc.git```
+   * **Initialize and Update Submodules:**
+   ```bash
+   cd grpc
+   git submodule update --init --recursive 
+   ```
+   * **Create a Branch:** Make your changes on a new branch: 
+   ```git checkout -b my-feature-branch```
+3. **Setting up Your Local System for Development and Testing:**
+   * Create a new virtual environment by running:```python -m venv ~/.virtualenvs/grpc-python```
+   * Activate the environment: ```source ~/.virtualenvs/grpc-python/bin/activate```
+   * Install Dependencies: ```pip install -r requirements.txt```
+4. **Run Tests:**
+   * Before making any changes, run the existing test suite to ensure your environment is set up correctly:
+   * **Using Bazel (Recommended):**
+     * To run a single unit test:
+       ```bash
+       bazel test --cache_test_results=no "//src/python/grpcio_tests/tests/unit:_abort_test" 
+       ```
+     * To execute all unit tests for Python:
+       ```bash
+       bazel test --cache_test_results=no "//src/python/..." 
+       ```
+   * **Using Provided Scripts (Alternative):**
+     * Install Python Modules:
+       ```bash
+       ./tools/distrib/install_all_python_modules.sh
+       ```
+     * Run Tooling Tests:
+       ```bash
+       ./tools/distrib/run_python_tooling_tests.sh
+       ```
+   * **Verify No Failures:** Make sure all tests pass before submitting your patch.
+5. **Commit & Push Changes:**
+    * **Commit:** `git commit -m "Add new feature: brief description"`  (Make sure your commit message is clear and concise.)
+    * **Push:** `git push origin my-feature-branch`
+6. **Open a Pull Request (PR):**
+    * **Go to GitHub:** Visit the original gRPC Python repository on GitHub.
+    * **Click "New Pull Request":** Compare your branch with the main branch and submit your pull request.
+    * **Provide a Description:**  Write a clear explanation of your changes, referencing the relevant issue(s).
+7. **Code Review:**
+    * **Wait for Feedback:** Maintainers will review your PR and provide feedback.
+    * **Respond to Comments:**  Address any questions or concerns raised during the review.
+    * **Make Revisions:** Update your code as needed based on the feedback.
+
+## Code Style
+
+* **Pythonic Code:** Follow the [PEP 8 style guide](https://www.python.org/dev/peps/pep-0008/) for Python code.
+* **Type Hints:** Use type hints to improve code readability and maintainability.
+* **Formatting:** Use [Black](https://black.readthedocs.io/en/stable/) for automatic code formatting.
+

From 0979765fd32a5f913b7492cb1999f99ac49f9a3b Mon Sep 17 00:00:00 2001
From: erm-g <110920239+erm-g@users.noreply.github.com>
Date: Thu, 3 Oct 2024 08:30:48 -0700
Subject: [PATCH 33/74] [flake] Increase timeout to ssl_credentials_test
 flakiness (#37844)

In some rare occasions on Win machines (0,3-0,4%), the tests are stuck when we execute the loop of 10 DoRpc calls. We receive Deadline Exceeded for such cases. The PR bumps the deadline from 10 to 60s (no flakes for --runs_per_test=10000).

Closes #37844

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37844 from erm-g:seqFix 8644db81949735d7793d70c6510e1e6e830c7dd6
PiperOrigin-RevId: 681891281
---
 test/cpp/end2end/ssl_credentials_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cpp/end2end/ssl_credentials_test.cc b/test/cpp/end2end/ssl_credentials_test.cc
index 325dc79068d..b111e5bfbc2 100644
--- a/test/cpp/end2end/ssl_credentials_test.cc
+++ b/test/cpp/end2end/ssl_credentials_test.cc
@@ -100,7 +100,7 @@ void DoRpc(const std::string& server_addr,
   grpc::testing::EchoResponse response;
   request.set_message(kMessage);
   ClientContext context;
-  context.set_deadline(grpc_timeout_seconds_to_deadline(/*time_s=*/10));
+  context.set_deadline(grpc_timeout_seconds_to_deadline(/*time_s=*/60));
   grpc::Status result = stub->Echo(&context, request, &response);
   EXPECT_TRUE(result.ok());
   if (!result.ok()) {

From 00545fa0fab227ed4a93bf6a67f12648d8a42cad Mon Sep 17 00:00:00 2001
From: Yousuk Seung <ysseung@google.com>
Date: Thu, 3 Oct 2024 10:21:21 -0700
Subject: [PATCH 34/74] [generic API] add separate targets for cq generic
 stub/service (#36447) (#37838)

This allows to restrict CQ based generic stub/service use.

See https://github.com/grpc/proposal/pull/426

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37838

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37838 from yousukseung:generic-stub 3e7c558372e733bfd6c73279619eb10040c6e061
PiperOrigin-RevId: 681932616
---
 BUILD | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/BUILD b/BUILD
index 51633565bb3..4d57a053c1f 100644
--- a/BUILD
+++ b/BUILD
@@ -2961,6 +2961,18 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "generic_stub",
+    hdrs = [
+        "include/grpcpp/generic/generic_stub.h",
+    ],
+    language = "c++",
+    visibility = ["@grpc:public"],
+    deps = [
+        "generic_stub_internal",
+    ],
+)
+
 grpc_cc_library(
     name = "generic_stub_callback",
     hdrs = [
@@ -2973,6 +2985,18 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "async_generic_service",
+    hdrs = [
+        "include/grpcpp/generic/async_generic_service.h",
+    ],
+    language = "c++",
+    visibility = ["@grpc:public"],
+    deps = [
+        "grpc++_public_hdrs",
+    ],
+)
+
 grpc_cc_library(
     name = "callback_generic_service",
     hdrs = [

From 41dc97e1d66f32d95fdf016641164d9f7dc6fb94 Mon Sep 17 00:00:00 2001
From: Alexander Polcyn <apolcyn@google.com>
Date: Thu, 3 Oct 2024 11:30:33 -0700
Subject: [PATCH 35/74] Handle backport PRs without piper info in release notes
 automation

Example commits on v1.67.x that are failing the current regex match:

```
commit 1eb5673cdd2471cfa8f68dbe1123c35e9ee03574
Author: apolcyn <apolcyn@google.com>
Date:   Mon Sep 16 12:35:34 2024 -0700

    [objc] backport https://github.com/grpc/grpc/pull/37690 to v1.67.x (#37712)

    Backport https://github.com/grpc/grpc/pull/37690

    cc @HannahShiSFB @sampajano

    Co-authored-by: Hannah Shi <hannahshisfb@gmail.com>

commit ace22e307d1bb2f81420cd55a81b2725f50c894b
Author: apolcyn <apolcyn@google.com>
Date:   Thu Sep 12 10:16:46 2024 -0700

    [ruby] reduce an INFO log to DEBUG (backport https://github.com/grpc/grpc/pull/37633) (#37686)

    Backport https://github.com/grpc/grpc/pull/37633 to 1.67

    Note https://github.com/grpc/grpc/pull/37633 is not yet merged b/c of
    the master branch freeze. Merging on 1.67 with the idea that
    https://github.com/grpc/grpc/pull/37633 will merge as soon as the master
    branch is unfrozen.
```

PiperOrigin-RevId: 681960402
---
 tools/release/release_notes.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/release/release_notes.py b/tools/release/release_notes.py
index 5576b9f7161..a8423bf69b3 100644
--- a/tools/release/release_notes.py
+++ b/tools/release/release_notes.py
@@ -104,15 +104,16 @@ def get_commit_detail(commit):
     detail += "- " + title
     if not title.endswith("."):
         detail += "."
-    matches = re.search("PiperOrigin-RevId: ([0-9]+)$", output)
-    cl_num = matches.group(1)
-    detail += (
-        " ([commit](https://github.com/grpc/grpc/commit/"
-        + commit
-        + ")) ([CL](https://critique.corp.google.com/cl/"
-        + cl_num
-        + "))"
+    detail += " ([commit](https://github.com/grpc/grpc/commit/{}))".format(
+        commit
     )
+    matches = re.search("PiperOrigin-RevId: ([0-9]+)$", output)
+    # backport commits might not have PiperOrigin-RevId
+    if matches is not None:
+        cl_num = matches.group(1)
+        detail += " ([CL](https://critique.corp.google.com/cl/{}))".format(
+            cl_num
+        )
     return detail
 
 

From dbb5164ac7322d2a396675aab9cee7979203126d Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 4 Oct 2024 09:41:56 -0700
Subject: [PATCH 36/74] [clang-format] Remove custom clang-format rules for
 include ordering (#37820)

Closes #37820

PiperOrigin-RevId: 682352913
---
 .clang-format                                 | 30 -----------
 .../grpc/binder/cpp/exampleclient/native.cc   |  5 +-
 .../grpc/binder/cpp/exampleserver/native.cc   |  9 ++--
 examples/cpp/auth/ssl_client.cc               |  4 +-
 examples/cpp/auth/ssl_server.cc               |  4 +-
 examples/cpp/cancellation/client.cc           |  4 +-
 examples/cpp/cancellation/server.cc           |  4 +-
 examples/cpp/compression/greeter_client.cc    |  4 +-
 examples/cpp/compression/greeter_server.cc    |  4 +-
 examples/cpp/csm/csm_greeter_client.cc        |  7 ++-
 examples/cpp/csm/csm_greeter_server.cc        | 15 +++---
 .../csm/observability/csm_greeter_client.cc   |  7 ++-
 .../csm/observability/csm_greeter_server.cc   | 14 ++---
 examples/cpp/deadline/client.cc               |  4 +-
 examples/cpp/deadline/server.cc               |  4 +-
 .../cpp/debugging/crashing_greeter_client.cc  |  4 +-
 .../greeter_callback_server_admin.cc          | 10 ++--
 examples/cpp/error_details/greeter_client.cc  |  5 +-
 examples/cpp/error_details/greeter_server.cc  |  9 ++--
 examples/cpp/error_handling/greeter_client.cc |  4 +-
 examples/cpp/error_handling/greeter_server.cc |  8 +--
 .../client_flow_control_client.cc             |  8 +--
 .../client_flow_control_server.cc             |  8 +--
 .../server_flow_control_client.cc             |  8 +--
 .../server_flow_control_server.cc             | 10 ++--
 .../helloworld/greeter_client.cc              |  6 +--
 .../helloworld/greeter_server.cc              | 10 ++--
 examples/cpp/generic_api/greeter_client.cc    |  6 +--
 examples/cpp/generic_api/greeter_server.cc    |  6 +--
 examples/cpp/health/health_client.cc          |  5 +-
 examples/cpp/health/health_server.cc          |  8 +--
 .../cpp/helloworld/greeter_async_client.cc    |  4 +-
 .../cpp/helloworld/greeter_async_client2.cc   |  4 +-
 .../cpp/helloworld/greeter_async_server.cc    |  4 +-
 .../cpp/helloworld/greeter_callback_client.cc |  4 +-
 .../cpp/helloworld/greeter_callback_server.cc |  8 +--
 examples/cpp/helloworld/greeter_client.cc     |  4 +-
 examples/cpp/helloworld/greeter_server.cc     |  8 +--
 examples/cpp/helloworld/xds_greeter_client.cc |  4 +-
 examples/cpp/helloworld/xds_greeter_server.cc | 12 ++---
 .../cpp/interceptors/caching_interceptor.h    |  4 +-
 examples/cpp/interceptors/client.cc           |  4 +-
 examples/cpp/interceptors/server.cc           |  6 +--
 .../cpp/keepalive/greeter_callback_client.cc  |  4 +-
 .../cpp/keepalive/greeter_callback_server.cc  |  8 +--
 examples/cpp/load_balancing/greeter_client.cc |  4 +-
 examples/cpp/load_balancing/greeter_server.cc |  4 +-
 examples/cpp/metadata/greeter_client.cc       |  4 +-
 examples/cpp/metadata/greeter_server.cc       |  4 +-
 examples/cpp/multiplex/multiplex_client.cc    |  4 +-
 examples/cpp/multiplex/multiplex_server.cc    |  8 +--
 examples/cpp/orca/orca_server.cc              | 12 ++---
 .../otel/codelab/greeter_callback_client.cc   |  6 +--
 .../greeter_callback_client_solution.cc       |  6 +--
 .../otel/codelab/greeter_callback_server.cc   | 10 ++--
 .../greeter_callback_server_solution.cc       | 10 ++--
 examples/cpp/otel/codelab/util.cc             |  4 +-
 examples/cpp/otel/greeter_callback_client.cc  |  4 +-
 examples/cpp/otel/greeter_callback_server.cc  |  4 +-
 .../otel/ostream/greeter_callback_client.cc   |  4 +-
 .../otel/ostream/greeter_callback_server.cc   |  4 +-
 examples/cpp/otel/util.cc                     |  8 +--
 examples/cpp/reflection/reflection_server.cc  |  6 +--
 examples/cpp/retry/client.cc                  |  6 +--
 examples/cpp/retry/server.cc                  |  8 +--
 .../route_guide_callback_client.cc            | 14 ++---
 .../route_guide_callback_server.cc            | 12 ++---
 .../cpp/route_guide/route_guide_client.cc     | 12 ++---
 .../cpp/route_guide/route_guide_server.cc     | 12 ++---
 .../cpp/systemd_socket_activation/client.cc   |  4 +-
 .../cpp/systemd_socket_activation/server.cc   |  8 +--
 examples/cpp/unix_abstract_sockets/client.cc  |  4 +-
 examples/cpp/unix_abstract_sockets/server.cc  |  8 +--
 .../wait_for_ready/greeter_callback_client.cc |  4 +-
 examples/cpp/xds/xds_greeter_client.cc        |  4 +-
 examples/cpp/xds/xds_greeter_server.cc        | 12 ++---
 include/grpc++/impl/.clang-format             | 50 -----------------
 include/grpc/.clang-format                    | 50 -----------------
 include/grpc/compression.h                    |  3 +-
 include/grpc/credentials.h                    |  3 +-
 include/grpc/event_engine/endpoint_config.h   |  4 +-
 include/grpc/event_engine/event_engine.h      | 12 ++---
 include/grpc/event_engine/extensible.h        |  4 +-
 .../internal/memory_allocator_impl.h          |  8 +--
 include/grpc/event_engine/memory_allocator.h  |  7 ++-
 include/grpc/event_engine/memory_request.h    |  3 +-
 include/grpc/event_engine/slice.h             |  7 ++-
 include/grpc/event_engine/slice_buffer.h      | 13 +++--
 include/grpc/grpc.h                           |  3 +-
 include/grpc/grpc_audit_logging.h             |  6 +--
 include/grpc/grpc_crl_provider.h              |  8 +--
 include/grpc/grpc_posix.h                     |  3 +-
 include/grpc/grpc_security.h                  |  3 +-
 include/grpc/impl/call.h                      |  4 +-
 include/grpc/impl/grpc_types.h                |  3 +-
 include/grpc/impl/slice_type.h                |  3 +-
 include/grpc/passive_listener.h               |  4 +-
 include/grpc/support/alloc.h                  |  3 +-
 include/grpc/support/json.h                   |  3 +-
 include/grpc/support/log.h                    |  3 +-
 include/grpc/support/metrics.h                |  4 +-
 include/grpc/support/sync_posix.h             |  3 +-
 include/grpc/support/time.h                   |  3 +-
 include/grpcpp/.clang-format                  | 50 -----------------
 include/grpcpp/alarm.h                        |  4 +-
 include/grpcpp/channel.h                      |  4 +-
 include/grpcpp/client_context.h               | 12 ++---
 include/grpcpp/completion_queue.h             |  8 +--
 include/grpcpp/create_channel.h               |  4 +-
 include/grpcpp/create_channel_binder.h        |  7 ++-
 include/grpcpp/create_channel_posix.h         |  4 +-
 include/grpcpp/ext/call_metric_recorder.h     |  6 +--
 include/grpcpp/ext/csm_observability.h        |  6 +--
 include/grpcpp/ext/gcp_observability.h        |  6 +--
 ...alth_check_service_server_builder_option.h |  4 +-
 include/grpcpp/ext/orca_service.h             | 12 ++---
 include/grpcpp/ext/otel_plugin.h              |  9 ++--
 .../ext/proto_server_reflection_plugin.h      |  4 +-
 include/grpcpp/ext/server_metric_recorder.h   |  6 +--
 include/grpcpp/impl/.clang-format             | 50 -----------------
 include/grpcpp/impl/call_op_set.h             | 14 ++---
 include/grpcpp/impl/channel_argument_option.h |  6 +--
 include/grpcpp/impl/codegen/.clang-format     | 50 -----------------
 include/grpcpp/impl/create_auth_context.h     |  4 +-
 include/grpcpp/impl/delegating_channel.h      |  4 +-
 include/grpcpp/impl/generic_stub_internal.h   |  4 +-
 include/grpcpp/impl/grpc_library.h            |  4 +-
 include/grpcpp/impl/interceptor_common.h      | 10 ++--
 include/grpcpp/impl/metadata_map.h            |  4 +-
 include/grpcpp/impl/proto_utils.h             |  8 +--
 include/grpcpp/impl/rpc_method.h              |  4 +-
 include/grpcpp/impl/rpc_service_method.h      | 10 ++--
 include/grpcpp/impl/server_builder_option.h   |  6 +--
 include/grpcpp/impl/server_builder_plugin.h   |  4 +-
 .../grpcpp/impl/server_callback_handlers.h    |  4 +-
 include/grpcpp/impl/server_initializer.h      |  4 +-
 include/grpcpp/impl/service_type.h            |  4 +-
 include/grpcpp/impl/sync.h                    |  6 +--
 include/grpcpp/security/.clang-format         | 50 -----------------
 include/grpcpp/security/alts_context.h        |  6 +--
 include/grpcpp/security/alts_util.h           |  4 +-
 include/grpcpp/security/audit_logging.h       |  6 +--
 include/grpcpp/security/auth_context.h        |  6 +--
 .../grpcpp/security/auth_metadata_processor.h |  4 +-
 .../security/authorization_policy_provider.h  |  4 +-
 include/grpcpp/security/binder_credentials.h  |  4 +-
 include/grpcpp/security/credentials.h         |  8 +--
 include/grpcpp/security/server_credentials.h  |  6 +--
 .../security/tls_certificate_provider.h       | 12 ++---
 .../security/tls_certificate_verifier.h       | 12 ++---
 .../grpcpp/security/tls_credentials_options.h |  6 +--
 include/grpcpp/server.h                       |  8 +--
 include/grpcpp/server_builder.h               | 10 ++--
 include/grpcpp/server_context.h               | 14 ++---
 include/grpcpp/server_interface.h             |  4 +-
 include/grpcpp/server_posix.h                 |  4 +-
 include/grpcpp/support/.clang-format          | 50 -----------------
 include/grpcpp/support/async_stream.h         |  4 +-
 include/grpcpp/support/async_unary_call.h     |  4 +-
 include/grpcpp/support/byte_buffer.h          |  4 +-
 include/grpcpp/support/callback_common.h      |  8 +--
 include/grpcpp/support/channel_arguments.h    |  6 +--
 include/grpcpp/support/client_callback.h      | 10 ++--
 include/grpcpp/support/client_interceptor.h   |  8 +--
 include/grpcpp/support/interceptor.h          |  8 +--
 include/grpcpp/support/method_handler.h       |  4 +-
 include/grpcpp/support/proto_buffer_reader.h  | 10 ++--
 include/grpcpp/support/proto_buffer_writer.h  | 10 ++--
 include/grpcpp/support/server_callback.h      | 12 ++---
 include/grpcpp/support/server_interceptor.h   |  8 +--
 include/grpcpp/support/string_ref.h           |  3 +-
 include/grpcpp/support/sync_stream.h          |  4 +-
 include/grpcpp/support/time.h                 |  4 +-
 .../grpcpp/test/client_context_test_peer.h    |  4 +-
 include/grpcpp/test/mock_stream.h             |  4 +-
 .../grpcpp/test/server_context_test_spouse.h  |  4 +-
 src/.clang-format                             | 50 -----------------
 src/compiler/.clang-format                    | 50 -----------------
 src/compiler/objective_c_generator.cc         |  4 +-
 src/compiler/objective_c_generator_helpers.h  |  4 +-
 src/compiler/objective_c_plugin.cc            |  4 +-
 src/compiler/php_generator.cc                 |  4 +-
 src/core/.clang-format                        | 50 -----------------
 src/core/channelz/channel_trace.cc            |  9 ++--
 src/core/channelz/channel_trace.h             |  8 ++-
 src/core/channelz/channelz.cc                 |  9 ++--
 src/core/channelz/channelz.h                  | 10 ++--
 src/core/channelz/channelz_registry.cc        | 11 ++--
 src/core/channelz/channelz_registry.h         |  5 +-
 src/core/client_channel/.clang-format         | 53 -------------------
 src/core/client_channel/backup_poller.cc      |  9 ++--
 src/core/client_channel/client_channel.cc     | 21 ++++----
 src/core/client_channel/client_channel.h      |  1 -
 .../client_channel/client_channel_factory.cc  |  4 +-
 .../client_channel/client_channel_factory.h   |  1 -
 .../client_channel/client_channel_filter.cc   | 19 +++----
 .../client_channel/client_channel_filter.h    |  7 +--
 .../client_channel/client_channel_internal.h  |  1 -
 .../client_channel/client_channel_plugin.cc   |  4 +-
 .../client_channel_service_config.cc          |  5 +-
 .../client_channel_service_config.h           |  2 -
 src/core/client_channel/config_selector.h     |  5 +-
 src/core/client_channel/dynamic_filters.cc    |  4 +-
 src/core/client_channel/dynamic_filters.h     |  3 +-
 .../client_channel/global_subchannel_pool.cc  |  4 +-
 .../client_channel/global_subchannel_pool.h   |  1 -
 src/core/client_channel/lb_metadata.h         |  5 +-
 .../load_balanced_call_destination.cc         |  1 -
 .../load_balanced_call_destination.h          |  1 -
 .../client_channel/local_subchannel_pool.cc   |  5 +-
 src/core/client_channel/retry_filter.cc       |  8 ++-
 src/core/client_channel/retry_filter.h        |  9 ++--
 .../retry_filter_legacy_call_data.cc          |  4 +-
 .../retry_filter_legacy_call_data.h           |  9 ++--
 .../client_channel/retry_service_config.cc    | 12 ++---
 .../client_channel/retry_service_config.h     |  2 -
 src/core/client_channel/retry_throttle.cc     |  7 ++-
 src/core/client_channel/retry_throttle.h      |  5 +-
 src/core/client_channel/subchannel.cc         | 11 ++--
 src/core/client_channel/subchannel.h          |  7 +--
 .../subchannel_pool_interface.cc              |  4 +-
 .../subchannel_pool_interface.h               |  1 -
 .../subchannel_stream_client.cc               |  7 +--
 .../client_channel/subchannel_stream_client.h | 10 ++--
 src/core/ext/.clang-format                    | 50 -----------------
 src/core/ext/filters/.clang-format            | 53 -------------------
 .../backend_metrics/backend_metric_filter.cc  | 13 ++---
 .../backend_metrics/backend_metric_filter.h   |  1 -
 src/core/ext/filters/census/grpc_context.cc   |  3 +-
 .../filters/channel_idle/idle_filter_state.cc |  3 +-
 .../filters/channel_idle/idle_filter_state.h  |  1 -
 .../legacy_channel_idle_filter.cc             |  8 ++-
 .../channel_idle/legacy_channel_idle_filter.h |  4 +-
 .../fault_injection/fault_injection_filter.cc |  7 +--
 .../fault_injection/fault_injection_filter.h  |  2 -
 .../fault_injection_service_config_parser.cc  |  5 +-
 .../fault_injection_service_config_parser.h   |  5 +-
 .../gcp_authentication_filter.cc              |  1 -
 .../gcp_authentication_filter.h               |  1 -
 ...cp_authentication_service_config_parser.cc |  5 +-
 ...gcp_authentication_service_config_parser.h |  1 -
 .../filters/http/client/http_client_filter.cc | 12 ++---
 .../filters/http/client/http_client_filter.h  |  1 -
 .../filters/http/client_authority_filter.cc   |  8 ++-
 .../filters/http/client_authority_filter.h    |  1 -
 .../ext/filters/http/http_filters_plugin.cc   |  1 -
 .../message_compress/compression_filter.cc    | 13 ++---
 .../message_compress/compression_filter.h     |  5 +-
 .../filters/http/server/http_server_filter.cc | 10 ++--
 .../filters/http/server/http_server_filter.h  |  1 -
 .../registered_opencensus_objects.h           |  1 -
 .../server_load_reporting_filter.cc           | 13 ++---
 .../server_load_reporting_filter.h            |  2 -
 .../ext/filters/logging/logging_filter.cc     | 11 ++--
 src/core/ext/filters/logging/logging_filter.h |  1 -
 src/core/ext/filters/logging/logging_sink.h   |  2 -
 .../message_size/message_size_filter.cc       |  9 ++--
 .../message_size/message_size_filter.h        |  2 -
 src/core/ext/filters/rbac/rbac_filter.cc      |  8 ++-
 src/core/ext/filters/rbac/rbac_filter.h       |  2 -
 .../rbac/rbac_service_config_parser.cc        |  8 ++-
 .../filters/rbac/rbac_service_config_parser.h |  2 -
 .../stateful_session_filter.cc                |  4 +-
 .../stateful_session_filter.h                 |  2 -
 .../stateful_session_service_config_parser.cc |  5 +-
 .../stateful_session_service_config_parser.h  |  2 -
 src/core/ext/transport/.clang-format          | 50 -----------------
 src/core/ext/transport/binder/.clang-format   | 50 -----------------
 .../binder/client/binder_connector.cc         |  5 +-
 .../binder/client/binder_connector.h          | 11 ++--
 .../transport/binder/client/channel_create.cc |  7 ++-
 .../binder/client/channel_create_impl.cc      |  1 -
 .../binder/client/connection_id_generator.h   |  5 +-
 .../binder/client/endpoint_binder_pool.cc     |  4 +-
 .../binder/client/endpoint_binder_pool.h      |  5 +-
 .../ext/transport/binder/client/jni_utils.cc  |  4 +-
 .../ext/transport/binder/client/jni_utils.h   |  3 +-
 .../binder/client/security_policy_setting.cc  |  4 +-
 .../binder/client/security_policy_setting.h   |  5 +-
 .../security_policy/binder_security_policy.cc |  1 -
 .../transport/binder/server/binder_server.cc  |  5 +-
 .../transport/binder/server/binder_server.h   |  7 ++-
 .../server/binder_server_credentials.cc       |  4 +-
 .../binder/transport/binder_transport.cc      |  1 -
 .../binder/transport/binder_transport.h       |  7 ++-
 .../ext/transport/binder/utils/ndk_binder.cc  |  1 -
 .../binder/utils/transport_stream_receiver.h  |  5 +-
 .../utils/transport_stream_receiver_impl.cc   |  1 -
 .../utils/transport_stream_receiver_impl.h    |  4 +-
 .../ext/transport/binder/wire_format/binder.h |  5 +-
 .../binder/wire_format/binder_android.cc      |  1 -
 .../binder/wire_format/binder_android.h       |  1 -
 .../binder/wire_format/binder_constants.h     |  4 +-
 .../binder/wire_format/transaction.h          |  5 +-
 .../binder/wire_format/wire_reader.h          |  4 +-
 .../binder/wire_format/wire_reader_impl.cc    |  1 -
 .../binder/wire_format/wire_reader_impl.h     |  7 ++-
 .../binder/wire_format/wire_writer.cc         |  1 -
 .../binder/wire_format/wire_writer.h          |  5 +-
 .../chaotic_good/chaotic_good_transport.h     |  5 +-
 .../client/chaotic_good_connector.cc          |  7 ++-
 .../client/chaotic_good_connector.h           |  7 ++-
 .../chaotic_good/client_transport.cc          |  9 ++--
 .../transport/chaotic_good/client_transport.h | 10 ++--
 src/core/ext/transport/chaotic_good/frame.cc  |  6 +--
 src/core/ext/transport/chaotic_good/frame.h   |  5 +-
 .../transport/chaotic_good/frame_header.cc    |  4 +-
 .../ext/transport/chaotic_good/frame_header.h |  4 +-
 .../server/chaotic_good_server.cc             | 11 ++--
 .../chaotic_good/server/chaotic_good_server.h |  7 ++-
 .../chaotic_good/server_transport.cc          | 11 ++--
 .../transport/chaotic_good/server_transport.h | 12 ++---
 .../chaotic_good/settings_metadata.cc         |  3 +-
 .../chaotic_good/settings_metadata.h          |  3 +-
 src/core/ext/transport/chttp2/alpn/alpn.cc    |  3 +-
 src/core/ext/transport/chttp2/alpn/alpn.h     |  3 +-
 .../chttp2/client/chttp2_connector.cc         | 18 +++----
 .../chttp2/client/chttp2_connector.h          |  5 +-
 .../transport/chttp2/server/chttp2_server.cc  | 18 +++----
 .../transport/chttp2/server/chttp2_server.h   |  4 +-
 .../transport/chttp2/transport/.clang-format  | 50 -----------------
 .../transport/chttp2/transport/bin_decoder.cc |  7 ++-
 .../transport/chttp2/transport/bin_decoder.h  |  5 +-
 .../transport/chttp2/transport/bin_encoder.cc |  4 +-
 .../transport/chttp2/transport/bin_encoder.h  |  3 +-
 .../chttp2/transport/chttp2_transport.cc      | 20 ++++---
 .../chttp2/transport/chttp2_transport.h       |  7 ++-
 .../chttp2/transport/context_list_entry.h     |  3 +-
 .../transport/chttp2/transport/decode_huff.h  |  4 +-
 .../chttp2/transport/flow_control.cc          |  4 +-
 .../transport/chttp2/transport/flow_control.h |  4 +-
 .../ext/transport/chttp2/transport/frame.cc   |  4 +-
 .../ext/transport/chttp2/transport/frame.h    |  5 +-
 .../transport/chttp2/transport/frame_data.cc  |  6 +--
 .../transport/chttp2/transport/frame_data.h   |  6 +--
 .../chttp2/transport/frame_goaway.cc          |  8 ++-
 .../transport/chttp2/transport/frame_goaway.h |  3 +-
 .../transport/chttp2/transport/frame_ping.cc  |  6 +--
 .../transport/chttp2/transport/frame_ping.h   |  3 +-
 .../chttp2/transport/frame_rst_stream.cc      |  6 +--
 .../chttp2/transport/frame_rst_stream.h       |  3 +-
 .../chttp2/transport/frame_settings.cc        |  6 +--
 .../chttp2/transport/frame_settings.h         |  5 +-
 .../chttp2/transport/frame_window_update.cc   |  4 +-
 .../chttp2/transport/frame_window_update.h    |  3 +-
 .../chttp2/transport/hpack_constants.h        |  4 +-
 .../chttp2/transport/hpack_encoder.cc         |  9 ++--
 .../chttp2/transport/hpack_encoder.h          |  6 +--
 .../chttp2/transport/hpack_encoder_table.cc   |  4 +-
 .../chttp2/transport/hpack_encoder_table.h    |  3 +-
 .../chttp2/transport/hpack_parse_result.cc    |  4 +-
 .../chttp2/transport/hpack_parse_result.h     |  4 +-
 .../chttp2/transport/hpack_parser.cc          |  6 +--
 .../transport/chttp2/transport/hpack_parser.h |  6 +--
 .../chttp2/transport/hpack_parser_table.cc    |  4 +-
 .../chttp2/transport/hpack_parser_table.h     |  4 +-
 .../chttp2/transport/http2_settings.cc        |  3 +-
 .../chttp2/transport/http2_settings.h         |  4 +-
 .../ext/transport/chttp2/transport/internal.h | 14 +++--
 .../ext/transport/chttp2/transport/parsing.cc | 10 ++--
 .../chttp2/transport/ping_abuse_policy.cc     |  6 +--
 .../chttp2/transport/ping_abuse_policy.h      |  4 +-
 .../chttp2/transport/ping_callbacks.cc        |  4 +-
 .../chttp2/transport/ping_callbacks.h         |  6 +--
 .../chttp2/transport/ping_rate_policy.cc      |  7 ++-
 .../chttp2/transport/ping_rate_policy.h       |  4 +-
 .../chttp2/transport/stream_lists.cc          |  5 +-
 .../ext/transport/chttp2/transport/varint.cc  |  4 +-
 .../ext/transport/chttp2/transport/varint.h   |  3 +-
 .../chttp2/transport/write_size_policy.cc     |  4 +-
 .../chttp2/transport/write_size_policy.h      |  3 +-
 .../ext/transport/chttp2/transport/writing.cc | 10 ++--
 .../client/secure/cronet_channel_create.cc    |  5 +-
 .../cronet/transport/cronet_api_phony.cc      |  4 +-
 .../cronet/transport/cronet_transport.cc      | 16 +++---
 .../ext/transport/inproc/inproc_transport.cc  |  7 ++-
 .../inproc/legacy_inproc_transport.cc         | 16 +++---
 src/core/filter/blackboard.h                  |  1 -
 .../endpoint_info/endpoint_info_handshaker.cc |  5 +-
 src/core/handshaker/handshaker.cc             | 12 ++---
 src/core/handshaker/handshaker.h              |  8 ++-
 src/core/handshaker/handshaker_registry.cc    |  3 +-
 src/core/handshaker/handshaker_registry.h     |  4 +-
 .../http_connect/http_connect_handshaker.cc   | 10 ++--
 .../http_connect/http_proxy_mapper.cc         |  8 ++-
 .../http_connect/http_proxy_mapper.h          |  5 +-
 src/core/handshaker/proxy_mapper.h            |  5 +-
 src/core/handshaker/proxy_mapper_registry.cc  |  4 +-
 src/core/handshaker/proxy_mapper_registry.h   |  5 +-
 .../handshaker/security/secure_endpoint.cc    | 18 +++----
 .../handshaker/security/secure_endpoint.h     |  3 +-
 .../security/security_handshaker.cc           | 16 +++---
 .../handshaker/security/security_handshaker.h |  3 +-
 .../tcp_connect/tcp_connect_handshaker.cc     | 11 ++--
 src/core/lib/address_utils/parse_address.cc   |  1 -
 src/core/lib/address_utils/parse_address.h    |  4 +-
 src/core/lib/address_utils/sockaddr_utils.cc  |  4 +-
 src/core/lib/address_utils/sockaddr_utils.h   |  4 +-
 src/core/lib/channel/call_finalization.h      |  4 +-
 src/core/lib/channel/channel_args.cc          | 10 ++--
 src/core/lib/channel/channel_args.h           |  8 ++-
 .../channel/channel_args_preconditioning.cc   |  4 +-
 .../channel/channel_args_preconditioning.h    |  6 +--
 src/core/lib/channel/channel_stack.cc         |  4 +-
 src/core/lib/channel/channel_stack.h          |  9 ++--
 src/core/lib/channel/channel_stack_builder.cc |  4 +-
 src/core/lib/channel/channel_stack_builder.h  |  5 +-
 .../lib/channel/channel_stack_builder_impl.cc |  6 +--
 .../lib/channel/channel_stack_builder_impl.h  |  3 +-
 src/core/lib/channel/connected_channel.cc     | 10 ++--
 src/core/lib/channel/promise_based_filter.cc  |  7 ++-
 src/core/lib/channel/promise_based_filter.h   |  8 ++-
 src/core/lib/channel/status_util.cc           |  4 +-
 src/core/lib/channel/status_util.h            |  6 +--
 src/core/lib/compression/compression.cc       |  8 ++-
 .../lib/compression/compression_internal.cc   |  6 +--
 .../lib/compression/compression_internal.h    |  6 +--
 src/core/lib/compression/message_compress.cc  |  9 ++--
 src/core/lib/config/config_vars.cc            |  5 +-
 src/core/lib/config/config_vars.h             |  3 +-
 .../lib/config/config_vars_non_generated.cc   |  4 +-
 src/core/lib/config/core_configuration.cc     |  4 +-
 src/core/lib/config/core_configuration.h      |  5 +-
 src/core/lib/config/load_config.cc            |  4 +-
 src/core/lib/config/load_config.h             |  3 +-
 src/core/lib/debug/trace.cc                   |  7 ++-
 src/core/lib/debug/trace_flags.cc             |  1 -
 src/core/lib/debug/trace_impl.h               |  4 +-
 src/core/lib/event_engine/ares_resolver.cc    |  8 ++-
 src/core/lib/event_engine/ares_resolver.h     | 13 ++---
 .../lib/event_engine/cf_engine/cf_engine.cc   |  4 +-
 .../cf_engine/cfstream_endpoint.cc            |  1 -
 .../cf_engine/cfstream_endpoint.h             |  4 +-
 .../cf_engine/dns_service_resolver.cc         |  1 -
 .../cf_engine/dns_service_resolver.h          |  4 +-
 .../channel_args_endpoint_config.cc           |  7 ++-
 .../channel_args_endpoint_config.h            |  5 +-
 src/core/lib/event_engine/common_closures.h   |  6 +--
 .../lib/event_engine/default_event_engine.cc  |  7 ++-
 .../lib/event_engine/default_event_engine.h   |  4 +-
 .../default_event_engine_factory.cc           |  4 +-
 .../default_event_engine_factory.h            |  4 +-
 src/core/lib/event_engine/event_engine.cc     |  4 +-
 .../extensions/can_track_errors.h             |  4 +-
 .../extensions/chaotic_good_extension.h       |  3 +-
 .../lib/event_engine/extensions/supports_fd.h |  6 +--
 .../lib/event_engine/extensions/tcp_trace.h   |  1 -
 src/core/lib/event_engine/forkable.cc         |  4 +-
 src/core/lib/event_engine/forkable.h          |  4 +-
 src/core/lib/event_engine/grpc_polled_fd.h    |  5 +-
 src/core/lib/event_engine/handle_containers.h |  5 +-
 .../event_engine/memory_allocator_factory.h   |  7 ++-
 src/core/lib/event_engine/poller.h            |  4 +-
 .../event_engine/posix_engine/.clang-format   | 50 -----------------
 .../posix_engine/ev_epoll1_linux.cc           | 10 ++--
 .../posix_engine/ev_epoll1_linux.h            |  7 ++-
 .../posix_engine/ev_poll_posix.cc             | 15 +++---
 .../event_engine/posix_engine/ev_poll_posix.h |  7 ++-
 .../event_engine/posix_engine/event_poller.h  |  7 ++-
 .../event_poller_posix_default.cc             |  5 +-
 .../posix_engine/event_poller_posix_default.h |  4 +-
 .../posix_engine/grpc_polled_fd_posix.h       |  8 ++-
 .../posix_engine/internal_errqueue.cc         |  3 +-
 .../posix_engine/internal_errqueue.h          |  3 +-
 .../posix_engine/lockfree_event.cc            |  7 ++-
 .../posix_engine/lockfree_event.h             |  5 +-
 .../posix_engine/native_posix_dns_resolver.cc |  1 -
 .../posix_engine/native_posix_dns_resolver.h  |  5 +-
 .../posix_engine/posix_endpoint.cc            | 12 ++---
 .../posix_engine/posix_endpoint.h             | 11 ++--
 .../event_engine/posix_engine/posix_engine.cc | 13 +++--
 .../event_engine/posix_engine/posix_engine.h  | 11 ++--
 .../posix_engine/posix_engine_closure.h       |  6 +--
 .../posix_engine/posix_engine_listener.cc     |  8 ++-
 .../posix_engine/posix_engine_listener.h      | 12 ++---
 .../posix_engine_listener_utils.cc            |  6 +--
 .../posix_engine_listener_utils.h             |  3 +-
 .../posix_engine/tcp_socket_utils.cc          | 11 ++--
 .../posix_engine/tcp_socket_utils.h           | 13 +++--
 .../lib/event_engine/posix_engine/timer.cc    |  6 +--
 .../lib/event_engine/posix_engine/timer.h     |  6 +--
 .../event_engine/posix_engine/timer_heap.cc   |  3 +-
 .../event_engine/posix_engine/timer_heap.h    |  4 +-
 .../posix_engine/timer_manager.cc             |  7 ++-
 .../event_engine/posix_engine/timer_manager.h |  6 +--
 .../posix_engine/traced_buffer_list.cc        |  6 +--
 .../posix_engine/traced_buffer_list.h         |  6 +--
 .../posix_engine/wakeup_fd_eventfd.cc         |  5 +-
 .../posix_engine/wakeup_fd_eventfd.h          |  5 +-
 .../posix_engine/wakeup_fd_pipe.cc            |  5 +-
 .../posix_engine/wakeup_fd_pipe.h             |  5 +-
 .../posix_engine/wakeup_fd_posix.h            |  4 +-
 .../posix_engine/wakeup_fd_posix_default.cc   |  5 +-
 .../posix_engine/wakeup_fd_posix_default.h    |  4 +-
 src/core/lib/event_engine/query_extensions.h  |  4 +-
 .../ref_counted_dns_resolver_interface.h      |  6 +--
 src/core/lib/event_engine/resolved_address.cc |  6 +--
 src/core/lib/event_engine/slice.cc            |  8 ++-
 src/core/lib/event_engine/slice_buffer.cc     |  3 +-
 src/core/lib/event_engine/tcp_socket_utils.cc |  1 -
 src/core/lib/event_engine/tcp_socket_utils.h  |  6 +--
 .../event_engine/thread_pool/thread_count.cc  |  4 +-
 .../event_engine/thread_pool/thread_count.h   |  7 ++-
 .../event_engine/thread_pool/thread_pool.h    |  6 +--
 .../thread_pool/thread_pool_factory.cc        |  3 +-
 .../thread_pool/work_stealing_thread_pool.cc  |  6 +--
 .../thread_pool/work_stealing_thread_pool.h   |  8 ++-
 .../thready_event_engine.cc                   |  4 +-
 .../thready_event_engine.h                    | 10 ++--
 src/core/lib/event_engine/time_util.cc        |  4 +-
 src/core/lib/event_engine/time_util.h         |  3 +-
 src/core/lib/event_engine/utils.cc            |  6 +--
 src/core/lib/event_engine/utils.h             |  5 +-
 .../lib/event_engine/windows/.clang-format    | 50 -----------------
 .../windows/grpc_polled_fd_windows.cc         |  7 +--
 .../windows/grpc_polled_fd_windows.h          |  8 ++-
 src/core/lib/event_engine/windows/iocp.cc     |  7 ++-
 src/core/lib/event_engine/windows/iocp.h      |  3 +-
 .../windows/native_windows_dns_resolver.cc    |  4 +-
 .../lib/event_engine/windows/win_socket.cc    |  5 +-
 .../lib/event_engine/windows/win_socket.h     |  5 +-
 .../event_engine/windows/windows_endpoint.cc  |  7 ++-
 .../event_engine/windows/windows_engine.cc    | 13 +++--
 .../lib/event_engine/windows/windows_engine.h | 11 ++--
 .../event_engine/windows/windows_listener.cc  |  1 -
 .../event_engine/windows/windows_listener.h   |  7 ++-
 .../work_queue/basic_work_queue.cc            |  4 +-
 .../work_queue/basic_work_queue.h             |  6 +--
 .../lib/event_engine/work_queue/work_queue.h  |  5 +-
 src/core/lib/experiments/config.cc            |  4 +-
 src/core/lib/experiments/config.h             |  3 +-
 src/core/lib/iomgr/buffer_list.cc             |  3 +-
 src/core/lib/iomgr/buffer_list.h              |  3 +-
 src/core/lib/iomgr/call_combiner.cc           |  4 +-
 src/core/lib/iomgr/call_combiner.h            |  6 +--
 src/core/lib/iomgr/cfstream_handle.cc         |  4 +-
 src/core/lib/iomgr/closure.cc                 |  4 +-
 src/core/lib/iomgr/closure.h                  |  6 +--
 src/core/lib/iomgr/combiner.cc                |  6 +--
 src/core/lib/iomgr/combiner.h                 |  3 +-
 src/core/lib/iomgr/endpoint.h                 |  3 +-
 src/core/lib/iomgr/endpoint_cfstream.cc       |  6 +--
 src/core/lib/iomgr/endpoint_pair_posix.cc     |  4 +-
 src/core/lib/iomgr/endpoint_pair_windows.cc   |  1 -
 src/core/lib/iomgr/error.cc                   | 10 ++--
 src/core/lib/iomgr/error.h                    | 10 ++--
 src/core/lib/iomgr/error_cfstream.cc          |  4 +-
 src/core/lib/iomgr/ev_apple.cc                |  1 -
 src/core/lib/iomgr/ev_epoll1_linux.cc         |  6 +--
 src/core/lib/iomgr/ev_poll_posix.cc           |  4 +-
 src/core/lib/iomgr/ev_posix.cc                |  6 +--
 src/core/lib/iomgr/ev_posix.h                 |  3 +-
 .../lib/iomgr/event_engine_shims/closure.cc   |  7 ++-
 .../lib/iomgr/event_engine_shims/closure.h    |  3 +-
 .../lib/iomgr/event_engine_shims/endpoint.cc  | 15 +++---
 .../lib/iomgr/event_engine_shims/endpoint.h   |  4 +-
 .../iomgr/event_engine_shims/tcp_client.cc    |  5 +-
 src/core/lib/iomgr/exec_ctx.cc                |  7 ++-
 src/core/lib/iomgr/exec_ctx.h                 |  7 ++-
 src/core/lib/iomgr/executor.cc                | 10 ++--
 src/core/lib/iomgr/fork_posix.cc              |  6 +--
 src/core/lib/iomgr/fork_windows.cc            |  4 +-
 src/core/lib/iomgr/internal_errqueue.cc       |  3 +-
 src/core/lib/iomgr/iocp_windows.cc            |  6 +--
 src/core/lib/iomgr/iomgr.cc                   | 10 ++--
 src/core/lib/iomgr/iomgr.h                    |  3 +-
 src/core/lib/iomgr/iomgr_internal.cc          |  3 +-
 src/core/lib/iomgr/iomgr_internal.h           |  3 +-
 src/core/lib/iomgr/iomgr_windows.cc           |  1 -
 src/core/lib/iomgr/lockfree_event.cc          |  5 +-
 src/core/lib/iomgr/polling_entity.cc          |  5 +-
 src/core/lib/iomgr/pollset_set_windows.cc     |  3 +-
 src/core/lib/iomgr/resolve_address.cc         |  3 +-
 src/core/lib/iomgr/resolve_address.h          |  6 +--
 src/core/lib/iomgr/resolve_address_impl.h     |  3 +-
 src/core/lib/iomgr/resolve_address_posix.cc   |  5 +-
 src/core/lib/iomgr/resolve_address_posix.h    |  4 +-
 src/core/lib/iomgr/resolve_address_windows.cc | 10 ++--
 src/core/lib/iomgr/resolve_address_windows.h  |  4 +-
 src/core/lib/iomgr/resolved_address.h         |  3 +-
 src/core/lib/iomgr/sockaddr_utils_posix.cc    |  6 +--
 src/core/lib/iomgr/socket_mutator.h           |  3 +-
 src/core/lib/iomgr/socket_utils.h             |  3 +-
 .../lib/iomgr/socket_utils_common_posix.cc    |  8 ++-
 src/core/lib/iomgr/socket_utils_posix.cc      |  6 +--
 src/core/lib/iomgr/socket_windows.cc          |  6 +--
 src/core/lib/iomgr/socket_windows.h           |  3 +-
 src/core/lib/iomgr/tcp_client_cfstream.cc     |  8 ++-
 src/core/lib/iomgr/tcp_client_posix.cc        |  6 +--
 src/core/lib/iomgr/tcp_client_windows.cc      |  6 +--
 src/core/lib/iomgr/tcp_posix.cc               | 19 +++----
 src/core/lib/iomgr/tcp_server.h               |  4 +-
 src/core/lib/iomgr/tcp_server_posix.cc        | 18 +++----
 src/core/lib/iomgr/tcp_server_utils_posix.h   |  5 +-
 .../iomgr/tcp_server_utils_posix_common.cc    |  6 +--
 .../iomgr/tcp_server_utils_posix_ifaddrs.cc   |  4 +-
 src/core/lib/iomgr/tcp_server_windows.cc      | 16 +++---
 src/core/lib/iomgr/tcp_windows.cc             |  8 ++-
 src/core/lib/iomgr/timer.h                    |  4 +-
 src/core/lib/iomgr/timer_generic.cc           | 10 ++--
 src/core/lib/iomgr/timer_heap.cc              |  3 +-
 src/core/lib/iomgr/timer_manager.cc           |  6 +--
 src/core/lib/iomgr/timer_manager.h            |  3 +-
 src/core/lib/iomgr/unix_sockets_posix.cc      |  5 +-
 src/core/lib/iomgr/unix_sockets_posix.h       |  7 ++-
 src/core/lib/iomgr/vsock.cc                   |  4 +-
 src/core/lib/iomgr/vsock.h                    |  7 ++-
 src/core/lib/iomgr/wakeup_fd_pipe.cc          |  1 -
 src/core/lib/promise/activity.cc              |  4 +-
 src/core/lib/promise/activity.h               |  4 +-
 src/core/lib/promise/all_ok.h                 |  5 +-
 src/core/lib/promise/arena_promise.h          |  4 +-
 src/core/lib/promise/context.h                |  5 +-
 src/core/lib/promise/detail/join_state.h      |  5 +-
 src/core/lib/promise/detail/promise_factory.h |  5 +-
 src/core/lib/promise/detail/promise_like.h    |  5 +-
 src/core/lib/promise/detail/seq_state.h       |  4 +-
 src/core/lib/promise/detail/status.h          |  4 +-
 .../promise/event_engine_wakeup_scheduler.h   |  7 ++-
 .../lib/promise/exec_ctx_wakeup_scheduler.h   |  3 +-
 src/core/lib/promise/for_each.h               |  4 +-
 src/core/lib/promise/if.h                     |  5 +-
 src/core/lib/promise/inter_activity_latch.h   |  4 +-
 src/core/lib/promise/inter_activity_pipe.h    |  4 +-
 src/core/lib/promise/interceptor_list.h       |  4 +-
 src/core/lib/promise/join.h                   |  4 +-
 src/core/lib/promise/latch.h                  |  4 +-
 src/core/lib/promise/loop.h                   |  5 +-
 src/core/lib/promise/map.h                    |  3 +-
 src/core/lib/promise/map_pipe.h               |  5 +-
 src/core/lib/promise/mpsc.h                   |  4 +-
 src/core/lib/promise/observable.h             |  5 +-
 src/core/lib/promise/party.cc                 |  5 +-
 src/core/lib/promise/party.h                  |  6 +--
 src/core/lib/promise/pipe.h                   |  4 +-
 src/core/lib/promise/poll.h                   |  5 +-
 src/core/lib/promise/prioritized_race.h       |  4 +-
 src/core/lib/promise/promise.h                |  5 +-
 src/core/lib/promise/promise_mutex.h          |  5 +-
 src/core/lib/promise/race.h                   |  4 +-
 src/core/lib/promise/seq.h                    |  3 +-
 src/core/lib/promise/sleep.cc                 |  4 +-
 src/core/lib/promise/sleep.h                  |  7 ++-
 src/core/lib/promise/status_flag.h            |  5 +-
 src/core/lib/promise/switch.h                 |  4 +-
 src/core/lib/promise/try_join.h               |  5 +-
 src/core/lib/promise/try_seq.h                |  4 +-
 src/core/lib/promise/wait_for_callback.h      |  5 +-
 src/core/lib/promise/wait_set.h               |  5 +-
 src/core/lib/resource_quota/api.cc            |  8 ++-
 src/core/lib/resource_quota/api.h             |  3 +-
 src/core/lib/resource_quota/arena.cc          |  7 ++-
 src/core/lib/resource_quota/arena.h           |  5 +-
 .../lib/resource_quota/connection_quota.cc    |  4 +-
 .../lib/resource_quota/connection_quota.h     |  5 +-
 src/core/lib/resource_quota/memory_quota.cc   |  8 ++-
 src/core/lib/resource_quota/memory_quota.h    |  8 ++-
 .../lib/resource_quota/periodic_update.cc     |  4 +-
 src/core/lib/resource_quota/periodic_update.h |  4 +-
 src/core/lib/resource_quota/resource_quota.h  |  9 ++--
 src/core/lib/resource_quota/thread_quota.cc   |  4 +-
 src/core/lib/resource_quota/thread_quota.h    |  5 +-
 .../security/authorization/audit_logging.cc   |  9 ++--
 .../security/authorization/audit_logging.h    |  9 ++--
 .../authorization/authorization_engine.h      |  4 +-
 .../authorization_policy_provider.h           |  3 +-
 .../authorization/cel_authorization_engine.cc |  3 +-
 .../authorization/cel_authorization_engine.h  |  7 ++-
 .../security/authorization/evaluate_args.cc   |  6 +--
 .../security/authorization/evaluate_args.h    |  7 ++-
 .../grpc_authorization_engine.cc              |  5 +-
 .../authorization/grpc_authorization_engine.h |  5 +-
 .../grpc_authorization_policy_provider.cc     | 14 +++--
 .../grpc_authorization_policy_provider.h      |  9 ++--
 .../authorization/grpc_server_authz_filter.cc |  5 +-
 .../authorization/grpc_server_authz_filter.h  |  3 +-
 .../lib/security/authorization/matchers.cc    |  6 +--
 .../lib/security/authorization/matchers.h     |  4 +-
 .../authorization/mock_cel/activation.h       |  3 +-
 .../mock_cel/cel_expr_builder_factory.h       |  4 +-
 .../authorization/mock_cel/cel_expression.h   |  5 +-
 .../authorization/mock_cel/cel_value.h        |  3 +-
 .../authorization/mock_cel/evaluator_core.h   |  5 +-
 .../mock_cel/flat_expr_builder.h              |  5 +-
 .../lib/security/authorization/rbac_policy.cc |  4 +-
 .../lib/security/authorization/rbac_policy.h  |  6 +--
 .../security/authorization/rbac_translator.cc |  8 ++-
 .../security/authorization/rbac_translator.h  |  5 +-
 .../security/authorization/stdout_logger.cc   |  8 +--
 .../security/authorization/stdout_logger.h    |  8 +--
 .../certificate_provider_factory.h            |  7 ++-
 .../certificate_provider_registry.cc          |  4 +-
 .../certificate_provider_registry.h           |  5 +-
 .../lib/security/context/security_context.cc  | 12 ++---
 .../lib/security/context/security_context.h   | 12 ++---
 .../credentials/alts/alts_credentials.cc      |  4 +-
 .../credentials/alts/check_gcp_environment.cc |  5 +-
 .../alts/check_gcp_environment_linux.cc       |  3 +-
 .../alts/check_gcp_environment_no_op.cc       |  1 -
 .../alts/check_gcp_environment_windows.cc     |  5 +-
 .../grpc_alts_credentials_client_options.cc   |  3 +-
 .../alts/grpc_alts_credentials_options.cc     |  4 +-
 .../security/credentials/call_creds_util.cc   |  6 +--
 .../security/credentials/call_creds_util.h    |  4 +-
 .../credentials/channel_creds_registry.h      |  5 +-
 .../channel_creds_registry_init.cc            | 13 +++--
 .../composite/composite_credentials.cc        |  5 +-
 .../composite/composite_credentials.h         | 13 +++--
 .../lib/security/credentials/credentials.cc   |  4 +-
 .../lib/security/credentials/credentials.h    | 15 +++---
 .../aws_external_account_credentials.cc       | 16 +++---
 .../aws_external_account_credentials.h        |  5 +-
 .../external/aws_request_signer.cc            |  9 ++--
 .../credentials/external/aws_request_signer.h |  4 +-
 .../external/external_account_credentials.cc  | 16 +++---
 .../external/external_account_credentials.h   |  6 +--
 .../file_external_account_credentials.cc      |  9 ++--
 .../file_external_account_credentials.h       |  5 +-
 .../url_external_account_credentials.cc       | 16 +++---
 .../url_external_account_credentials.h        |  5 +-
 .../credentials/fake/fake_credentials.cc      |  4 +-
 .../credentials/fake/fake_credentials.h       |  7 ++-
 ...cp_service_account_identity_credentials.cc |  5 +-
 ...gcp_service_account_identity_credentials.h |  6 +--
 .../google_default/credentials_generic.cc     |  5 +-
 .../google_default_credentials.cc             | 18 +++----
 .../google_default_credentials.h              |  4 +-
 .../credentials/iam/iam_credentials.cc        |  4 +-
 .../credentials/iam/iam_credentials.h         |  9 ++--
 .../insecure/insecure_credentials.cc          |  4 +-
 .../security/credentials/jwt/json_token.cc    | 25 ++++-----
 .../lib/security/credentials/jwt/json_token.h |  3 +-
 .../credentials/jwt/jwt_credentials.cc        | 14 +++--
 .../credentials/jwt/jwt_credentials.h         | 12 ++---
 .../security/credentials/jwt/jwt_verifier.cc  | 31 +++++------
 .../security/credentials/jwt/jwt_verifier.h   |  3 +-
 .../credentials/local/local_credentials.cc    |  4 +-
 .../credentials/oauth2/oauth2_credentials.cc  | 20 ++++---
 .../credentials/oauth2/oauth2_credentials.h   | 13 +++--
 .../credentials/plugin/plugin_credentials.cc  |  7 ++-
 .../credentials/plugin/plugin_credentials.h   | 14 +++--
 .../credentials/ssl/ssl_credentials.cc        | 10 ++--
 .../credentials/ssl/ssl_credentials.h         |  6 +--
 .../tls/grpc_tls_certificate_distributor.cc   |  6 +--
 .../tls/grpc_tls_certificate_distributor.h    |  5 +-
 .../tls/grpc_tls_certificate_match.cc         |  4 +-
 .../tls/grpc_tls_certificate_provider.cc      | 10 ++--
 .../tls/grpc_tls_certificate_provider.h       |  8 ++-
 .../tls/grpc_tls_certificate_verifier.cc      |  8 ++-
 .../tls/grpc_tls_certificate_verifier.h       | 11 ++--
 .../tls/grpc_tls_credentials_options.cc       |  7 ++-
 .../credentials/tls/grpc_tls_crl_provider.cc  |  4 +-
 .../credentials/tls/grpc_tls_crl_provider.h   | 12 ++---
 .../credentials/tls/tls_credentials.cc        | 11 ++--
 .../lib/security/credentials/tls/tls_utils.cc |  3 +-
 .../lib/security/credentials/tls/tls_utils.h  |  6 +--
 .../token_fetcher/token_fetcher_credentials.h |  5 +-
 .../credentials/xds/xds_credentials.cc        |  5 +-
 .../credentials/xds/xds_credentials.h         | 10 ++--
 .../alts/alts_security_connector.cc           | 16 +++---
 .../fake/fake_security_connector.cc           | 12 ++---
 .../insecure/insecure_security_connector.cc   |  6 +--
 .../insecure/insecure_security_connector.h    |  9 ++--
 .../load_system_roots_supported.cc            |  8 ++-
 .../load_system_roots_windows.cc              |  7 ++-
 .../local/local_security_connector.cc         | 12 ++---
 .../security_connector/security_connector.cc  |  4 +-
 .../security_connector/security_connector.h   |  9 ++--
 .../ssl/ssl_security_connector.cc             |  6 +--
 .../ssl/ssl_security_connector.h              |  3 +-
 .../security/security_connector/ssl_utils.cc  | 18 +++----
 .../security/security_connector/ssl_utils.h   | 12 ++---
 .../tls/tls_security_connector.cc             | 12 ++---
 .../tls/tls_security_connector.h              | 11 ++--
 .../lib/security/transport/auth_filters.h     |  3 +-
 .../security/transport/client_auth_filter.cc  | 14 +++--
 .../security/transport/server_auth_filter.cc  | 15 +++---
 src/core/lib/security/util/json_util.cc       |  9 ++--
 src/core/lib/slice/percent_encoding.cc        |  4 +-
 src/core/lib/slice/slice.cc                   |  8 ++-
 src/core/lib/slice/slice.h                    | 10 ++--
 src/core/lib/slice/slice_buffer.cc            | 10 ++--
 src/core/lib/slice/slice_buffer.h             |  7 ++-
 src/core/lib/slice/slice_internal.h           |  6 +--
 src/core/lib/slice/slice_refcount.h           |  3 +-
 src/core/lib/slice/slice_string_helpers.h     |  3 +-
 src/core/lib/surface/byte_buffer.cc           |  3 +-
 src/core/lib/surface/byte_buffer_reader.cc    |  8 ++-
 src/core/lib/surface/call.cc                  | 28 +++++-----
 src/core/lib/surface/call.h                   | 10 ++--
 src/core/lib/surface/call_log_batch.cc        |  8 ++-
 src/core/lib/surface/call_test_only.h         |  3 +-
 src/core/lib/surface/call_utils.cc            | 28 +++++-----
 src/core/lib/surface/call_utils.h             | 28 +++++-----
 src/core/lib/surface/channel.cc               |  3 +-
 src/core/lib/surface/channel.h                | 13 +++--
 src/core/lib/surface/channel_create.cc        |  3 +-
 src/core/lib/surface/channel_create.h         |  5 +-
 src/core/lib/surface/channel_init.cc          |  4 +-
 src/core/lib/surface/channel_init.h           |  4 +-
 src/core/lib/surface/client_call.cc           | 28 +++++-----
 src/core/lib/surface/client_call.h            | 24 ++++-----
 src/core/lib/surface/completion_queue.cc      | 14 +++--
 src/core/lib/surface/completion_queue.h       |  3 +-
 .../lib/surface/completion_queue_factory.cc   |  3 +-
 src/core/lib/surface/event_string.cc          |  4 +-
 src/core/lib/surface/event_string.h           |  4 +-
 src/core/lib/surface/filter_stack_call.cc     | 28 +++++-----
 src/core/lib/surface/filter_stack_call.h      | 28 +++++-----
 src/core/lib/surface/init.cc                  |  9 ++--
 src/core/lib/surface/init.h                   |  4 +-
 src/core/lib/surface/lame_client.cc           | 11 ++--
 src/core/lib/surface/lame_client.h            |  7 ++-
 src/core/lib/surface/legacy_channel.cc        | 11 ++--
 src/core/lib/surface/legacy_channel.h         |  9 ++--
 src/core/lib/surface/metadata_array.cc        |  3 +-
 src/core/lib/surface/server_call.cc           | 22 ++++----
 src/core/lib/surface/server_call.h            | 28 +++++-----
 src/core/lib/surface/validate_metadata.cc     |  5 +-
 src/core/lib/surface/validate_metadata.h      |  6 +--
 src/core/lib/transport/bdp_estimator.cc       |  3 +-
 src/core/lib/transport/bdp_estimator.h        |  6 +--
 .../lib/transport/call_arena_allocator.cc     |  4 +-
 src/core/lib/transport/call_arena_allocator.h |  3 +-
 src/core/lib/transport/call_filters.cc        |  5 +-
 src/core/lib/transport/call_filters.h         |  5 +-
 src/core/lib/transport/call_final_info.cc     |  4 +-
 src/core/lib/transport/call_final_info.h      |  4 +-
 src/core/lib/transport/call_spine.cc          |  3 +-
 src/core/lib/transport/call_spine.h           |  3 +-
 src/core/lib/transport/call_state.h           |  3 +-
 src/core/lib/transport/connectivity_state.cc  |  3 +-
 src/core/lib/transport/connectivity_state.h   |  7 ++-
 src/core/lib/transport/error_utils.cc         |  5 +-
 src/core/lib/transport/error_utils.h          |  7 ++-
 src/core/lib/transport/interception_chain.cc  |  4 +-
 src/core/lib/transport/interception_chain.h   |  4 +-
 src/core/lib/transport/message.cc             |  4 +-
 src/core/lib/transport/metadata_batch.cc      |  4 +-
 src/core/lib/transport/metadata_batch.h       |  8 ++-
 .../transport/metadata_compression_traits.h   |  3 +-
 src/core/lib/transport/parsed_metadata.h      |  6 +--
 src/core/lib/transport/promise_endpoint.cc    | 11 ++--
 src/core/lib/transport/promise_endpoint.h     | 12 ++---
 .../transport/simple_slice_based_metadata.h   |  3 +-
 src/core/lib/transport/timeout_encoding.cc    |  6 +--
 src/core/lib/transport/timeout_encoding.h     |  4 +-
 src/core/lib/transport/transport.cc           |  8 ++-
 src/core/lib/transport/transport.h            | 12 ++---
 src/core/lib/transport/transport_op_string.cc |  5 +-
 src/core/load_balancing/.clang-format         | 50 -----------------
 src/core/load_balancing/address_filtering.cc  |  4 +-
 src/core/load_balancing/address_filtering.h   |  5 +-
 src/core/load_balancing/backend_metric_data.h |  4 +-
 .../load_balancing/backend_metric_parser.cc   |  3 +-
 .../load_balancing/backend_metric_parser.h    |  4 +-
 .../load_balancing/child_policy_handler.cc    |  7 ++-
 .../load_balancing/child_policy_handler.h     |  5 +-
 src/core/load_balancing/delegating_helper.h   |  9 ++--
 src/core/load_balancing/endpoint_list.cc      |  8 ++-
 src/core/load_balancing/endpoint_list.h       |  6 +--
 .../grpclb/client_load_reporting_filter.cc    |  5 +-
 .../grpclb/client_load_reporting_filter.h     |  3 +-
 src/core/load_balancing/grpclb/grpclb.cc      | 20 ++++---
 .../grpclb/grpclb_balancer_addresses.cc       |  3 +-
 .../grpclb/grpclb_client_stats.cc             |  3 +-
 .../grpclb/grpclb_client_stats.h              |  6 +--
 .../grpclb/load_balancer_api.cc               |  8 ++-
 .../load_balancing/grpclb/load_balancer_api.h |  8 ++-
 .../load_balancing/health_check_client.cc     | 16 +++---
 src/core/load_balancing/health_check_client.h |  4 +-
 .../health_check_client_internal.h            |  7 ++-
 src/core/load_balancing/lb_policy.h           | 12 ++---
 src/core/load_balancing/lb_policy_factory.h   |  5 +-
 src/core/load_balancing/lb_policy_registry.cc |  7 ++-
 src/core/load_balancing/lb_policy_registry.h  |  5 +-
 src/core/load_balancing/oob_backend_metric.cc | 18 +++----
 src/core/load_balancing/oob_backend_metric.h  |  4 +-
 .../oob_backend_metric_internal.h             |  7 ++-
 .../outlier_detection/outlier_detection.cc    |  8 ++-
 .../outlier_detection/outlier_detection.h     |  4 +-
 .../load_balancing/pick_first/pick_first.cc   | 10 ++--
 src/core/load_balancing/priority/priority.cc  | 10 ++--
 .../load_balancing/ring_hash/ring_hash.cc     | 10 ++--
 src/core/load_balancing/ring_hash/ring_hash.h |  3 +-
 src/core/load_balancing/rls/rls.cc            | 28 +++++-----
 .../load_balancing/round_robin/round_robin.cc |  6 +--
 .../load_balancing/subchannel_interface.h     |  7 ++-
 .../static_stride_scheduler.cc                |  4 +-
 .../static_stride_scheduler.h                 |  3 +-
 .../weighted_round_robin.cc                   |  8 ++-
 .../weighted_target/weighted_target.cc        |  8 ++-
 src/core/load_balancing/xds/cds.cc            | 11 ++--
 .../load_balancing/xds/xds_cluster_impl.cc    |  6 +--
 .../load_balancing/xds/xds_cluster_manager.cc |  8 ++-
 .../load_balancing/xds/xds_override_host.cc   |  8 ++-
 .../load_balancing/xds/xds_override_host.h    |  3 +-
 .../load_balancing/xds/xds_wrr_locality.cc    |  9 ++--
 src/core/resolver/.clang-format               | 50 -----------------
 src/core/resolver/binder/binder_resolver.cc   |  6 +--
 .../resolver/dns/c_ares/dns_resolver_ares.cc  |  9 ++--
 .../resolver/dns/c_ares/dns_resolver_ares.h   |  3 +-
 .../resolver/dns/c_ares/grpc_ares_ev_driver.h |  8 ++-
 .../dns/c_ares/grpc_ares_ev_driver_posix.cc   |  4 +-
 .../dns/c_ares/grpc_ares_ev_driver_windows.cc | 13 ++---
 .../resolver/dns/c_ares/grpc_ares_wrapper.cc  | 20 +++----
 .../resolver/dns/c_ares/grpc_ares_wrapper.h   |  7 +--
 src/core/resolver/dns/dns_resolver_plugin.cc  |  5 +-
 .../event_engine_client_channel_resolver.cc   |  8 ++-
 .../event_engine_client_channel_resolver.h    |  3 +-
 .../dns/event_engine/service_config_helper.cc |  4 +-
 .../dns/event_engine/service_config_helper.h  |  4 +-
 src/core/resolver/dns/native/dns_resolver.cc  |  7 ++-
 src/core/resolver/endpoint_addresses.cc       |  4 +-
 src/core/resolver/endpoint_addresses.h        |  5 +-
 src/core/resolver/fake/fake_resolver.cc       |  5 +-
 src/core/resolver/fake/fake_resolver.h        |  7 ++-
 .../google_c2p/google_c2p_resolver.cc         |  7 ++-
 src/core/resolver/polling_resolver.cc         |  4 +-
 src/core/resolver/polling_resolver.h          |  7 ++-
 src/core/resolver/resolver.h                  |  5 +-
 src/core/resolver/resolver_factory.h          |  5 +-
 src/core/resolver/resolver_registry.cc        |  4 +-
 src/core/resolver/resolver_registry.h         |  5 +-
 .../resolver/sockaddr/sockaddr_resolver.cc    |  5 +-
 src/core/resolver/xds/xds_config.cc           |  1 -
 src/core/resolver/xds/xds_config.h            |  1 -
 .../resolver/xds/xds_dependency_manager.cc    |  1 -
 .../resolver/xds/xds_dependency_manager.h     |  1 -
 src/core/resolver/xds/xds_resolver.cc         | 10 ++--
 .../resolver/xds/xds_resolver_attributes.h    |  3 +-
 src/core/server/server.cc                     | 18 +++----
 src/core/server/server.h                      | 14 +++--
 src/core/server/server_call_tracer_filter.cc  |  5 +-
 src/core/server/server_config_selector.h      |  5 +-
 .../server/server_config_selector_filter.cc   |  5 +-
 src/core/server/xds_channel_stack_modifier.cc |  4 +-
 src/core/server/xds_channel_stack_modifier.h  |  7 ++-
 src/core/server/xds_server_config_fetcher.cc  | 14 +++--
 src/core/service_config/service_config.h      |  6 +--
 .../service_config/service_config_call_data.h |  3 +-
 .../service_config_channel_arg_filter.cc      |  7 ++-
 .../service_config/service_config_impl.cc     |  4 +-
 src/core/service_config/service_config_impl.h |  6 +--
 .../service_config/service_config_parser.cc   |  3 +-
 .../service_config/service_config_parser.h    |  4 +-
 src/core/telemetry/call_tracer.cc             |  5 +-
 src/core/telemetry/call_tracer.h              |  7 ++-
 src/core/telemetry/histogram_view.h           |  3 +-
 src/core/telemetry/metrics.cc                 |  5 +-
 src/core/telemetry/metrics.h                  |  7 ++-
 src/core/telemetry/stats.cc                   |  3 +-
 src/core/telemetry/stats.h                    |  4 +-
 src/core/telemetry/stats_data.cc              |  3 +-
 src/core/telemetry/stats_data.h               |  4 +-
 src/core/telemetry/tcp_tracer.h               |  3 +-
 src/core/tsi/alts/crypt/aes_gcm.cc            | 13 ++---
 src/core/tsi/alts/crypt/gsec.cc               |  5 +-
 src/core/tsi/alts/crypt/gsec.h                |  7 ++-
 .../tsi/alts/frame_protector/alts_counter.cc  |  3 +-
 .../tsi/alts/frame_protector/alts_counter.h   |  5 +-
 .../tsi/alts/frame_protector/alts_crypter.cc  |  3 +-
 .../tsi/alts/frame_protector/alts_crypter.h   |  5 +-
 .../frame_protector/alts_frame_protector.cc   |  6 +--
 .../frame_protector/alts_frame_protector.h    |  3 +-
 .../tsi/alts/frame_protector/frame_handler.cc |  6 +--
 .../tsi/alts/frame_protector/frame_handler.h  |  3 +-
 .../alts/handshaker/alts_handshaker_client.cc | 11 ++--
 .../alts/handshaker/alts_shared_resource.cc   |  3 +-
 .../alts/handshaker/alts_tsi_handshaker.cc    | 14 +++--
 .../tsi/alts/handshaker/alts_tsi_utils.cc     |  5 +-
 .../transport_security_common_api.cc          |  4 +-
 ...lts_grpc_integrity_only_record_protocol.cc |  6 +--
 ...alts_grpc_integrity_only_record_protocol.h |  3 +-
 ..._grpc_privacy_integrity_record_protocol.cc |  3 +-
 ...s_grpc_privacy_integrity_record_protocol.h |  3 +-
 .../alts_grpc_record_protocol_common.cc       |  6 +--
 .../alts_iovec_record_protocol.cc             |  5 +-
 .../alts_iovec_record_protocol.h              |  3 +-
 .../alts_zero_copy_grpc_protector.cc          |  6 +--
 .../alts_zero_copy_grpc_protector.h           |  3 +-
 src/core/tsi/fake_transport_security.cc       |  6 +--
 src/core/tsi/local_transport_security.cc      |  8 ++-
 .../tsi/ssl/key_logging/ssl_key_logging.cc    |  5 +-
 .../tsi/ssl/key_logging/ssl_key_logging.h     | 12 ++---
 src/core/tsi/ssl/session_cache/ssl_session.h  |  7 ++-
 .../ssl/session_cache/ssl_session_cache.cc    |  5 +-
 .../tsi/ssl/session_cache/ssl_session_cache.h |  7 ++-
 .../ssl/session_cache/ssl_session_openssl.cc  |  4 +-
 src/core/tsi/ssl_transport_security.cc        | 23 ++++----
 src/core/tsi/ssl_transport_security.h         | 10 ++--
 src/core/tsi/ssl_transport_security_utils.cc  |  4 +-
 src/core/tsi/ssl_transport_security_utils.h   |  6 +--
 src/core/tsi/ssl_types.h                      |  3 +-
 src/core/tsi/transport_security.cc            |  5 +-
 src/core/tsi/transport_security.h             |  3 +-
 src/core/tsi/transport_security_interface.h   |  3 +-
 src/core/util/.clang-format                   | 53 -------------------
 src/core/util/alloc.cc                        |  5 +-
 src/core/util/atm.cc                          |  3 +-
 src/core/util/avl.h                           |  1 -
 src/core/util/backoff.cc                      |  4 +-
 src/core/util/backoff.h                       |  1 -
 src/core/util/bitset.h                        |  1 -
 src/core/util/chunked_vector.h                |  1 -
 src/core/util/crash.cc                        |  3 +-
 src/core/util/crash.h                         |  1 -
 src/core/util/dual_ref_counted.h              |  1 -
 src/core/util/event_log.cc                    |  4 +-
 src/core/util/event_log.h                     |  2 -
 src/core/util/examine_stack.cc                |  4 +-
 src/core/util/fork.cc                         |  7 ++-
 src/core/util/gcp_metadata_query.cc           | 11 ++--
 src/core/util/gcp_metadata_query.h            |  1 -
 src/core/util/gethostname_host_name_max.cc    |  3 +-
 src/core/util/gethostname_sysconf.cc          |  3 +-
 src/core/util/gpr_time.cc                     |  7 +--
 src/core/util/grpc_if_nametoindex.h           |  1 -
 src/core/util/grpc_if_nametoindex_posix.cc    |  1 -
 .../util/grpc_if_nametoindex_unsupported.cc   |  1 -
 src/core/util/host_port.cc                    |  3 +-
 src/core/util/http_client/format_request.cc   |  7 +--
 src/core/util/http_client/format_request.h    |  3 +-
 src/core/util/http_client/httpcli.cc          | 11 ++--
 src/core/util/http_client/httpcli.h           |  7 +--
 .../http_client/httpcli_security_connector.cc | 15 +++---
 .../http_client/httpcli_ssl_credentials.h     |  3 +-
 src/core/util/http_client/parser.cc           |  6 +--
 src/core/util/http_client/parser.h            |  4 +-
 src/core/util/iphone/cpu.cc                   |  3 +-
 src/core/util/json/json.h                     |  3 +-
 src/core/util/json/json_channel_args.h        |  1 -
 src/core/util/json/json_object_loader.cc      |  7 ++-
 src/core/util/json/json_object_loader.h       |  1 -
 src/core/util/json/json_reader.cc             |  5 +-
 src/core/util/json/json_reader.h              |  1 -
 src/core/util/json/json_util.cc               |  4 +-
 src/core/util/json/json_util.h                |  1 -
 src/core/util/json/json_writer.cc             |  2 -
 src/core/util/latent_see.cc                   |  1 -
 src/core/util/latent_see.h                    |  1 -
 src/core/util/linux/cpu.cc                    |  6 +--
 src/core/util/load_file.cc                    |  8 ++-
 src/core/util/load_file.h                     |  1 -
 src/core/util/log.cc                          | 11 ++--
 src/core/util/manual_constructor.h            |  1 -
 src/core/util/match.h                         |  1 -
 src/core/util/matchers.cc                     |  4 +-
 src/core/util/matchers.h                      |  1 -
 src/core/util/memory.h                        |  3 +-
 src/core/util/mpscq.cc                        |  4 +-
 src/core/util/mpscq.h                         |  1 -
 src/core/util/msys/tmpfile.cc                 |  5 +-
 src/core/util/notification.h                  |  1 -
 src/core/util/per_cpu.cc                      |  3 +-
 src/core/util/per_cpu.h                       |  4 +-
 src/core/util/posix/cpu.cc                    |  6 +--
 src/core/util/posix/stat.cc                   |  1 -
 src/core/util/posix/string.cc                 |  5 +-
 src/core/util/posix/sync.cc                   |  6 +--
 src/core/util/posix/thd.cc                    |  9 ++--
 src/core/util/posix/time.cc                   |  3 +-
 src/core/util/posix/tmpfile.cc                |  6 +--
 src/core/util/random_early_detection.cc       |  4 +-
 src/core/util/random_early_detection.h        |  1 -
 src/core/util/ref_counted.h                   |  1 -
 src/core/util/ref_counted_ptr.h               |  2 -
 src/core/util/ref_counted_string.cc           |  6 +--
 src/core/util/ref_counted_string.h            |  2 -
 src/core/util/spinlock.h                      |  3 +-
 src/core/util/stat.h                          |  1 -
 src/core/util/status_helper.cc                |  8 ++-
 src/core/util/status_helper.h                 |  2 -
 src/core/util/strerror.cc                     |  3 +-
 src/core/util/string.cc                       |  9 ++--
 src/core/util/string.h                        |  4 +-
 src/core/util/subprocess_posix.cc             |  4 +-
 src/core/util/subprocess_windows.cc           |  4 +-
 src/core/util/sync.cc                         |  8 ++-
 src/core/util/sync.h                          |  3 +-
 src/core/util/sync_abseil.cc                  |  8 ++-
 src/core/util/table.h                         |  2 -
 src/core/util/tchar.cc                        |  4 +-
 src/core/util/thd.h                           |  4 +-
 src/core/util/time.cc                         |  8 ++-
 src/core/util/time.h                          |  7 +--
 src/core/util/time_averaged_stats.cc          |  4 +-
 src/core/util/time_precise.cc                 |  5 +-
 src/core/util/time_precise.h                  |  1 -
 src/core/util/time_util.cc                    |  6 +--
 src/core/util/time_util.h                     |  3 +-
 src/core/util/tmpfile.h                       |  1 -
 src/core/util/unique_type_name.h              |  1 -
 src/core/util/uri.cc                          |  3 +-
 src/core/util/uuid_v4.cc                      |  4 +-
 src/core/util/uuid_v4.h                       |  1 -
 src/core/util/validation_errors.cc            |  3 +-
 src/core/util/validation_errors.h             |  1 -
 src/core/util/windows/directory_reader.cc     |  1 -
 src/core/util/windows/stat.cc                 |  1 -
 src/core/util/windows/string.cc               |  5 +-
 src/core/util/windows/string_util.cc          | 10 ++--
 src/core/util/windows/sync.cc                 |  3 +-
 src/core/util/windows/thd.cc                  |  8 ++-
 src/core/util/windows/time.cc                 |  4 +-
 src/core/util/windows/tmpfile.cc              |  5 +-
 src/core/util/work_serializer.cc              |  7 +--
 src/core/util/work_serializer.h               |  4 +-
 .../xds/grpc/certificate_provider_store.cc    |  5 +-
 .../xds/grpc/certificate_provider_store.h     |  7 ++-
 ...le_watcher_certificate_provider_factory.cc |  7 ++-
 ...ile_watcher_certificate_provider_factory.h |  7 ++-
 .../xds/grpc/xds_audit_logger_registry.cc     |  5 +-
 src/core/xds/grpc/xds_audit_logger_registry.h |  5 +-
 src/core/xds/grpc/xds_bootstrap_grpc.cc       |  6 +--
 src/core/xds/grpc/xds_bootstrap_grpc.h        |  5 +-
 src/core/xds/grpc/xds_certificate_provider.cc |  5 +-
 src/core/xds/grpc/xds_certificate_provider.h  |  9 ++--
 src/core/xds/grpc/xds_client_grpc.cc          | 17 +++---
 src/core/xds/grpc/xds_client_grpc.h           |  7 ++-
 src/core/xds/grpc/xds_cluster.cc              |  1 -
 src/core/xds/grpc/xds_cluster.h               |  1 -
 src/core/xds/grpc/xds_cluster_parser.cc       |  5 +-
 src/core/xds/grpc/xds_cluster_parser.h        |  3 +-
 .../xds/grpc/xds_cluster_specifier_plugin.cc  | 12 ++---
 .../xds/grpc/xds_cluster_specifier_plugin.h   |  9 ++--
 src/core/xds/grpc/xds_common_types.cc         |  1 -
 src/core/xds/grpc/xds_common_types.h          |  1 -
 src/core/xds/grpc/xds_common_types_parser.cc  | 14 +++--
 src/core/xds/grpc/xds_common_types_parser.h   |  1 -
 src/core/xds/grpc/xds_endpoint.h              |  1 -
 src/core/xds/grpc/xds_endpoint_parser.cc      |  6 +--
 src/core/xds/grpc/xds_endpoint_parser.h       |  3 +-
 src/core/xds/grpc/xds_health_status.h         |  1 -
 src/core/xds/grpc/xds_http_fault_filter.cc    |  8 ++-
 src/core/xds/grpc/xds_http_fault_filter.h     |  7 ++-
 src/core/xds/grpc/xds_http_filter.h           |  3 +-
 src/core/xds/grpc/xds_http_filter_registry.cc |  5 +-
 src/core/xds/grpc/xds_http_filter_registry.h  |  3 +-
 .../xds/grpc/xds_http_gcp_authn_filter.cc     |  5 +-
 src/core/xds/grpc/xds_http_gcp_authn_filter.h |  3 +-
 src/core/xds/grpc/xds_http_rbac_filter.cc     |  8 ++-
 src/core/xds/grpc/xds_http_rbac_filter.h      |  7 ++-
 .../grpc/xds_http_stateful_session_filter.cc  |  7 ++-
 .../grpc/xds_http_stateful_session_filter.h   |  7 ++-
 src/core/xds/grpc/xds_lb_policy_registry.cc   |  6 +--
 src/core/xds/grpc/xds_lb_policy_registry.h    |  5 +-
 src/core/xds/grpc/xds_listener.cc             |  1 -
 src/core/xds/grpc/xds_listener.h              |  1 -
 src/core/xds/grpc/xds_listener_parser.cc      |  6 +--
 src/core/xds/grpc/xds_listener_parser.h       |  3 +-
 src/core/xds/grpc/xds_metadata.h              |  1 -
 src/core/xds/grpc/xds_metadata_parser.cc      |  5 +-
 src/core/xds/grpc/xds_metadata_parser.h       |  1 -
 src/core/xds/grpc/xds_route_config.cc         |  1 -
 src/core/xds/grpc/xds_route_config.h          |  1 -
 src/core/xds/grpc/xds_route_config_parser.cc  | 12 ++---
 src/core/xds/grpc/xds_route_config_parser.h   |  6 +--
 src/core/xds/grpc/xds_routing.cc              |  4 +-
 src/core/xds/grpc/xds_routing.h               |  4 +-
 src/core/xds/grpc/xds_server_grpc.cc          |  1 -
 src/core/xds/grpc/xds_transport_grpc.cc       | 18 +++----
 src/core/xds/grpc/xds_transport_grpc.h        | 11 ++--
 src/core/xds/xds_client/lrs_client.cc         | 13 +++--
 src/core/xds/xds_client/lrs_client.h          |  7 ++-
 src/core/xds/xds_client/xds_api.cc            | 14 +++--
 src/core/xds/xds_client/xds_api.h             |  8 ++-
 .../xds_backend_metric_propagation.cc         |  1 -
 .../xds_backend_metric_propagation.h          |  1 -
 src/core/xds/xds_client/xds_bootstrap.cc      |  3 +-
 src/core/xds/xds_client/xds_bootstrap.h       |  4 +-
 src/core/xds/xds_client/xds_client.cc         | 10 ++--
 src/core/xds/xds_client/xds_client.h          |  9 ++--
 src/core/xds/xds_client/xds_locality.h        |  1 -
 src/core/xds/xds_client/xds_metrics.h         |  4 +-
 src/core/xds/xds_client/xds_resource_type.h   |  9 ++--
 .../xds/xds_client/xds_resource_type_impl.h   |  5 +-
 src/core/xds/xds_client/xds_transport.h       |  1 -
 src/cpp/client/call_credentials.cc            |  5 +-
 src/cpp/client/channel_cc.cc                  | 17 +++---
 src/cpp/client/channel_credentials.cc         |  8 +--
 src/cpp/client/client_context.cc              | 20 ++++---
 src/cpp/client/create_channel.cc              | 10 ++--
 src/cpp/client/create_channel_internal.cc     |  4 +-
 src/cpp/client/create_channel_internal.h      |  8 +--
 src/cpp/client/create_channel_posix.cc        | 10 ++--
 src/cpp/client/cronet_credentials.cc          | 10 ++--
 src/cpp/client/global_callback_hook.cc        |  4 +-
 src/cpp/client/insecure_credentials.cc        |  4 +-
 src/cpp/client/secure_credentials.cc          | 24 ++++-----
 src/cpp/client/xds_credentials.cc             |  8 +--
 src/cpp/common/alarm.cc                       | 15 +++---
 src/cpp/common/alts_context.cc                | 10 ++--
 src/cpp/common/alts_util.cc                   | 15 +++---
 src/cpp/common/auth_property_iterator.cc      |  4 +-
 src/cpp/common/channel_arguments.cc           | 13 +++--
 src/cpp/common/completion_queue_cc.cc         | 11 ++--
 .../common/insecure_create_auth_context.cc    |  4 +-
 src/cpp/common/resource_quota_cc.cc           |  5 +-
 src/cpp/common/secure_auth_context.cc         |  4 +-
 src/cpp/common/secure_auth_context.h          |  6 +--
 src/cpp/common/secure_create_auth_context.cc  |  4 +-
 src/cpp/common/tls_certificate_provider.cc    |  9 ++--
 src/cpp/common/tls_certificate_verifier.cc    | 19 ++++---
 src/cpp/common/tls_credentials_options.cc     | 10 ++--
 src/cpp/common/validate_service_config.cc     |  7 ++-
 src/cpp/common/version_cc.cc                  |  4 +-
 src/cpp/ext/chaotic_good.cc                   |  4 +-
 src/cpp/ext/chaotic_good.h                    |  4 +-
 src/cpp/ext/csm/csm_observability.cc          |  7 ++-
 src/cpp/ext/csm/csm_observability.h           |  3 +-
 src/cpp/ext/csm/metadata_exchange.cc          |  8 ++-
 src/cpp/ext/csm/metadata_exchange.h           |  7 ++-
 src/cpp/ext/filters/census/client_filter.cc   | 14 +++--
 src/cpp/ext/filters/census/client_filter.h    |  3 +-
 src/cpp/ext/filters/census/context.cc         |  5 +-
 src/cpp/ext/filters/census/context.h          | 12 ++---
 src/cpp/ext/filters/census/grpc_plugin.cc     |  9 ++--
 src/cpp/ext/filters/census/grpc_plugin.h      |  6 +--
 src/cpp/ext/filters/census/measures.cc        |  3 +-
 src/cpp/ext/filters/census/measures.h         |  4 +-
 .../filters/census/open_census_call_tracer.h  |  8 ++-
 src/cpp/ext/filters/census/rpc_encoding.h     |  3 +-
 .../ext/filters/census/server_call_tracer.cc  |  8 ++-
 src/cpp/ext/filters/census/views.cc           |  7 ++-
 src/cpp/ext/gcp/environment_autodetect.cc     | 11 ++--
 src/cpp/ext/gcp/environment_autodetect.h      |  7 ++-
 src/cpp/ext/gcp/observability.cc              | 16 +++---
 src/cpp/ext/gcp/observability_config.cc       |  8 ++-
 src/cpp/ext/gcp/observability_config.h        |  4 +-
 src/cpp/ext/gcp/observability_logging_sink.cc | 17 +++---
 src/cpp/ext/gcp/observability_logging_sink.h  |  6 +--
 src/cpp/ext/otel/key_value_iterable.h         |  4 +-
 src/cpp/ext/otel/otel_client_call_tracer.cc   |  8 ++-
 src/cpp/ext/otel/otel_client_call_tracer.h    |  6 +--
 src/cpp/ext/otel/otel_plugin.cc               |  9 ++--
 src/cpp/ext/otel/otel_plugin.h                |  8 ++-
 src/cpp/ext/otel/otel_server_call_tracer.cc   |  5 +-
 src/cpp/ext/otel/otel_server_call_tracer.h    |  3 +-
 src/cpp/ext/proto_server_reflection.cc        |  6 +--
 src/cpp/ext/proto_server_reflection.h         | 12 ++---
 src/cpp/ext/proto_server_reflection_plugin.cc |  6 +--
 .../server/authorization_policy_provider.cc   |  6 +--
 src/cpp/server/backend_metric_recorder.cc     |  6 +--
 src/cpp/server/backend_metric_recorder.h      | 10 ++--
 src/cpp/server/channel_argument_option.cc     |  8 +--
 src/cpp/server/channelz/channelz_service.cc   |  4 +-
 .../channelz/channelz_service_plugin.cc       |  6 +--
 src/cpp/server/csds/csds.cc                   | 10 ++--
 src/cpp/server/dynamic_thread_pool.h          |  4 +-
 .../external_connection_acceptor_impl.cc      |  8 +--
 .../external_connection_acceptor_impl.h       |  6 +--
 .../health/default_health_check_service.cc    | 14 +++--
 .../health/default_health_check_service.h     | 14 +++--
 ...lth_check_service_server_builder_option.cc |  8 +--
 src/cpp/server/insecure_server_credentials.cc |  4 +-
 src/cpp/server/load_reporter/constants.h      |  3 +-
 src/cpp/server/load_reporter/get_cpu_stats.h  |  3 +-
 .../load_reporter/get_cpu_stats_linux.cc      |  4 +-
 .../get_cpu_stats_unsupported.cc              |  1 -
 .../server/load_reporter/load_data_store.cc   |  4 +-
 .../server/load_reporter/load_data_store.h    |  5 +-
 src/cpp/server/load_reporter/load_reporter.cc |  4 +-
 src/cpp/server/load_reporter/load_reporter.h  |  7 +--
 .../load_reporter_async_service_impl.cc       |  9 ++--
 .../load_reporter_async_service_impl.h        | 12 ++---
 ...reporting_service_server_builder_option.cc |  8 +--
 ...reporting_service_server_builder_plugin.cc |  4 +-
 ..._reporting_service_server_builder_plugin.h |  6 +--
 src/cpp/server/load_reporter/util.cc          |  9 ++--
 src/cpp/server/orca/orca_service.cc           | 32 ++++++-----
 src/cpp/server/secure_server_credentials.cc   |  8 +--
 src/cpp/server/secure_server_credentials.h    |  4 +-
 src/cpp/server/server_builder.cc              | 22 ++++----
 src/cpp/server/server_cc.cc                   | 34 ++++++------
 src/cpp/server/server_context.cc              | 30 +++++------
 src/cpp/server/xds_server_credentials.cc      |  8 +--
 src/cpp/thread_manager/thread_manager.cc      |  1 -
 src/cpp/util/byte_buffer_cc.cc                |  6 +--
 src/cpp/util/status.cc                        |  4 +-
 src/cpp/util/string_ref.cc                    |  3 +-
 src/cpp/util/time_cc.cc                       |  6 +--
 .../tests/CppCronetTests/TestHelper.h         |  7 ++-
 .../grpc_observability/client_call_tracer.cc  |  4 +-
 .../grpc_observability/client_call_tracer.h   |  4 +-
 .../grpc_observability/metadata_exchange.cc   |  4 +-
 .../grpc_observability/metadata_exchange.h    |  1 -
 .../grpc_observability/observability_util.h   |  3 +-
 .../python_observability_context.cc           |  1 -
 .../python_observability_context.h            |  4 +-
 .../grpc_observability/rpc_encoding.h         |  3 +-
 .../grpc_observability/server_call_tracer.cc  |  4 +-
 .../grpc_observability/server_call_tracer.h   |  5 +-
 src/ruby/ext/grpc/rb_byte_buffer.c            |  6 +--
 src/ruby/ext/grpc/rb_call.c                   | 10 ++--
 src/ruby/ext/grpc/rb_call_credentials.c       | 11 ++--
 src/ruby/ext/grpc/rb_channel.c                | 13 +++--
 src/ruby/ext/grpc/rb_channel_args.c           |  6 +--
 src/ruby/ext/grpc/rb_channel_credentials.c    | 11 ++--
 src/ruby/ext/grpc/rb_channel_credentials.h    |  3 +-
 src/ruby/ext/grpc/rb_completion_queue.c       |  7 ++-
 src/ruby/ext/grpc/rb_compression_options.c    | 11 ++--
 src/ruby/ext/grpc/rb_event_thread.c           |  9 ++--
 src/ruby/ext/grpc/rb_grpc.c                   |  7 ++-
 src/ruby/ext/grpc/rb_grpc.h                   |  3 +-
 src/ruby/ext/grpc/rb_server.c                 | 12 ++---
 src/ruby/ext/grpc/rb_server_credentials.c     |  6 +--
 src/ruby/ext/grpc/rb_server_credentials.h     |  3 +-
 .../ext/grpc/rb_xds_channel_credentials.c     | 11 ++--
 .../ext/grpc/rb_xds_channel_credentials.h     |  3 +-
 src/ruby/ext/grpc/rb_xds_server_credentials.c |  8 +--
 src/ruby/ext/grpc/rb_xds_server_credentials.h |  3 +-
 test/core/address_utils/parse_address_test.cc |  5 +-
 .../parse_address_with_named_scope_id_test.cc |  8 ++-
 .../sockaddr_utils_fuzzer_test.cc             |  1 -
 .../core/address_utils/sockaddr_utils_test.cc |  5 +-
 test/core/bad_client/bad_client.cc            | 10 ++--
 test/core/bad_client/bad_client.h             |  5 +-
 .../core/bad_client/tests/bad_streaming_id.cc |  8 ++-
 test/core/bad_client/tests/badreq.cc          |  3 +-
 .../bad_client/tests/connection_prefix.cc     |  3 +-
 .../core/bad_client/tests/duplicate_header.cc |  6 +--
 .../bad_client/tests/head_of_line_blocking.cc | 10 ++--
 test/core/bad_client/tests/headers.cc         |  3 +-
 .../tests/initial_settings_frame.cc           |  5 +-
 test/core/bad_client/tests/out_of_bounds.cc   |  8 ++-
 .../tests/server_registered_method.cc         |  3 +-
 test/core/bad_client/tests/simple_request.cc  |  3 +-
 test/core/bad_client/tests/unknown_frame.cc   |  8 ++-
 test/core/bad_client/tests/window_overflow.cc |  6 +--
 test/core/bad_connection/close_fd_test.cc     | 17 +++---
 test/core/bad_ssl/bad_ssl_test.cc             | 12 ++---
 test/core/bad_ssl/server_common.cc            |  4 +-
 test/core/bad_ssl/servers/alpn.cc             |  6 +--
 test/core/bad_ssl/servers/cert.cc             |  3 +-
 test/core/call/batch_builder.h                |  1 -
 test/core/call/bm_client_call.cc              |  1 -
 test/core/call/call_utils_test.cc             |  4 +-
 test/core/call/client_call_test.cc            |  3 +-
 test/core/call/request_buffer_test.cc         |  1 -
 test/core/call/server_call_test.cc            |  7 ++-
 test/core/call/yodel/fuzzer_main.cc           |  7 +--
 test/core/call/yodel/test_main.cc             |  1 -
 test/core/call/yodel/yodel_test.cc            |  1 -
 test/core/call/yodel/yodel_test.h             |  5 +-
 test/core/channel/call_finalization_test.cc   |  5 +-
 test/core/channel/channel_args_test.cc        | 10 ++--
 .../channel/channel_stack_builder_test.cc     |  5 +-
 test/core/channel/channel_stack_test.cc       |  5 +-
 .../channel/minimal_stack_is_minimal_test.cc  |  7 ++-
 .../server_call_tracer_factory_test.cc        |  1 -
 test/core/channelz/channel_trace_test.cc      | 10 ++--
 test/core/channelz/channelz_registry_test.cc  |  1 -
 test/core/channelz/channelz_test.cc           | 18 +++----
 test/core/client_channel/bm_client_channel.cc |  4 +-
 .../bm_load_balanced_call_destination.cc      |  4 +-
 .../client_channel_service_config_test.cc     |  7 ++-
 .../client_channel/client_channel_test.cc     |  5 +-
 .../connected_subchannel_test.cc              |  5 +-
 test/core/client_channel/lb_metadata_test.cc  |  1 -
 .../load_balanced_call_destination_test.cc    |  5 +-
 .../retry_service_config_test.cc              |  7 ++-
 .../client_channel/retry_throttle_test.cc     |  1 -
 .../client_channel/subchannel_args_test.cc    |  7 ++-
 .../miscompile_with_no_unique_address_test.cc |  4 +-
 test/core/compression/compression_test.cc     |  6 +--
 .../compression/message_compress_fuzzer.cc    |  5 +-
 .../core/compression/message_compress_test.cc |  6 +--
 .../compression/message_decompress_fuzzer.cc  |  5 +-
 test/core/config/core_configuration_test.cc   |  4 +-
 test/core/config/load_config_test.cc          |  1 -
 test/core/end2end/bad_server_response_test.cc | 20 ++++---
 test/core/end2end/connection_refused_test.cc  | 12 ++---
 test/core/end2end/cq_verifier.cc              | 14 +++--
 test/core/end2end/cq_verifier.h               | 10 ++--
 test/core/end2end/dualstack_socket_test.cc    | 21 ++++----
 test/core/end2end/end2end_test_fuzzer.cc      |  7 +--
 test/core/end2end/end2end_test_main.cc        |  1 -
 test/core/end2end/end2end_test_suites.cc      | 22 ++++----
 test/core/end2end/end2end_tests.h             | 22 ++++----
 test/core/end2end/fixtures/h2_oauth2_common.h |  6 +--
 .../fixtures/h2_ssl_cred_reload_fixture.h     |  6 +--
 .../core/end2end/fixtures/h2_ssl_tls_common.h |  6 +--
 test/core/end2end/fixtures/h2_tls_common.h    | 14 +++--
 .../end2end/fixtures/http_proxy_fixture.cc    | 12 ++---
 test/core/end2end/fixtures/inproc_fixture.h   |  3 +-
 test/core/end2end/fixtures/local_util.cc      |  7 ++-
 test/core/end2end/fixtures/local_util.h       |  7 ++-
 test/core/end2end/fixtures/proxy.cc           | 16 +++---
 test/core/end2end/fixtures/secure_fixture.h   |  9 ++--
 test/core/end2end/fixtures/sockpair_fixture.h |  9 ++--
 test/core/end2end/fuzzers/api_fuzzer.cc       | 14 +++--
 test/core/end2end/fuzzers/client_fuzzer.cc    |  9 ++--
 test/core/end2end/fuzzers/connector_fuzzer.h  |  1 -
 test/core/end2end/fuzzers/fuzzing_common.cc   | 16 +++---
 test/core/end2end/fuzzers/fuzzing_common.h    |  4 +-
 test/core/end2end/fuzzers/network_input.cc    |  4 +-
 test/core/end2end/fuzzers/server_fuzzer.cc    |  9 ++--
 test/core/end2end/fuzzers/server_fuzzer.h     |  3 +-
 .../fuzzers/server_fuzzer_chaotic_good.cc     |  3 +-
 test/core/end2end/goaway_server_test.cc       | 22 ++++----
 test/core/end2end/h2_ssl_cert_test.cc         | 22 ++++----
 .../core/end2end/h2_ssl_session_reuse_test.cc | 15 +++---
 ...ls_peer_property_external_verifier_test.cc | 17 +++---
 .../end2end/invalid_call_argument_test.cc     | 18 +++----
 test/core/end2end/no_server_test.cc           | 16 +++---
 test/core/end2end/tests/bad_ping.cc           |  7 ++-
 test/core/end2end/tests/binary_metadata.cc    |  7 ++-
 test/core/end2end/tests/call_creds.cc         | 11 ++--
 test/core/end2end/tests/call_host_override.cc |  7 ++-
 .../core/end2end/tests/cancel_after_accept.cc |  7 ++-
 .../end2end/tests/cancel_after_client_done.cc |  5 +-
 .../core/end2end/tests/cancel_after_invoke.cc |  5 +-
 .../end2end/tests/cancel_after_round_trip.cc  |  7 ++-
 .../end2end/tests/cancel_before_invoke.cc     |  5 +-
 test/core/end2end/tests/cancel_with_status.cc |  7 ++-
 test/core/end2end/tests/channelz.cc           |  7 ++-
 test/core/end2end/tests/client_streaming.cc   |  5 +-
 test/core/end2end/tests/compressed_payload.cc | 10 ++--
 test/core/end2end/tests/connectivity.cc       |  5 +-
 test/core/end2end/tests/default_host.cc       |  5 +-
 .../core/end2end/tests/disappearing_server.cc |  5 +-
 .../core/end2end/tests/filter_causes_close.cc |  4 +-
 test/core/end2end/tests/filter_init_fails.cc  |  5 +-
 test/core/end2end/tests/filtered_metadata.cc  |  5 +-
 .../end2end/tests/graceful_server_shutdown.cc |  5 +-
 test/core/end2end/tests/grpc_authz.cc         | 11 ++--
 test/core/end2end/tests/high_initial_seqno.cc |  7 ++-
 test/core/end2end/tests/hpack_size.cc         |  6 +--
 test/core/end2end/tests/http2_stats.cc        |  7 ++-
 .../end2end/tests/invoke_large_request.cc     |  6 +--
 test/core/end2end/tests/keepalive_timeout.cc  |  7 ++-
 test/core/end2end/tests/large_metadata.cc     |  6 +--
 .../end2end/tests/max_concurrent_streams.cc   |  7 ++-
 test/core/end2end/tests/max_connection_age.cc |  6 +--
 .../core/end2end/tests/max_connection_idle.cc |  9 ++--
 test/core/end2end/tests/max_message_length.cc |  7 ++-
 test/core/end2end/tests/negative_deadline.cc  |  5 +-
 test/core/end2end/tests/no_logging.cc         |  7 ++-
 test/core/end2end/tests/payload.cc            |  5 +-
 test/core/end2end/tests/ping.cc               |  5 +-
 .../core/end2end/tests/ping_pong_streaming.cc |  4 +-
 test/core/end2end/tests/proxy_auth.cc         |  5 +-
 test/core/end2end/tests/registered_call.cc    |  3 +-
 test/core/end2end/tests/request_with_flags.cc | 10 ++--
 .../end2end/tests/request_with_payload.cc     |  5 +-
 .../end2end/tests/resource_quota_server.cc    |  8 ++-
 test/core/end2end/tests/retry.cc              |  7 ++-
 ...retry_cancel_after_first_attempt_starts.cc |  5 +-
 .../tests/retry_cancel_during_delay.cc        |  7 ++-
 ...retry_cancel_with_multiple_send_batches.cc |  7 ++-
 test/core/end2end/tests/retry_cancellation.cc |  7 ++-
 test/core/end2end/tests/retry_disabled.cc     |  7 ++-
 .../retry_exceeds_buffer_size_in_delay.cc     |  7 ++-
 ...ry_exceeds_buffer_size_in_initial_batch.cc |  7 ++-
 ...exceeds_buffer_size_in_subsequent_batch.cc |  7 ++-
 test/core/end2end/tests/retry_lb_drop.cc      |  9 ++--
 test/core/end2end/tests/retry_lb_fail.cc      |  7 ++-
 .../tests/retry_non_retriable_status.cc       |  7 ++-
 ...ry_non_retriable_status_before_trailers.cc |  7 ++-
 .../tests/retry_per_attempt_recv_timeout.cc   |  7 ++-
 ...er_attempt_recv_timeout_on_last_attempt.cc |  7 ++-
 .../tests/retry_recv_initial_metadata.cc      |  7 ++-
 test/core/end2end/tests/retry_recv_message.cc |  7 ++-
 .../tests/retry_recv_message_replay.cc        |  7 ++-
 .../retry_recv_trailing_metadata_error.cc     |  7 ++-
 .../tests/retry_send_initial_metadata_refs.cc |  9 ++--
 .../core/end2end/tests/retry_send_op_fails.cc |  7 ++-
 .../end2end/tests/retry_send_recv_batch.cc    |  7 ++-
 .../tests/retry_server_pushback_delay.cc      |  7 ++-
 .../tests/retry_server_pushback_disabled.cc   |  7 ++-
 test/core/end2end/tests/retry_streaming.cc    |  7 ++-
 .../tests/retry_streaming_after_commit.cc     |  7 ++-
 ...reaming_succeeds_before_replay_finished.cc |  7 ++-
 test/core/end2end/tests/retry_throttled.cc    |  7 ++-
 .../end2end/tests/retry_too_many_attempts.cc  |  7 ++-
 .../end2end/tests/retry_transparent_goaway.cc |  7 ++-
 ...etry_transparent_max_concurrent_streams.cc |  9 ++--
 .../retry_transparent_not_sent_on_wire.cc     |  6 +--
 .../tests/retry_unref_before_finish.cc        |  7 ++-
 .../end2end/tests/retry_unref_before_recv.cc  |  7 ++-
 .../end2end/tests/server_finishes_request.cc  |  5 +-
 test/core/end2end/tests/server_streaming.cc   |  5 +-
 .../end2end/tests/shutdown_finishes_calls.cc  |  7 ++-
 .../end2end/tests/simple_delayed_request.cc   |  9 ++--
 test/core/end2end/tests/simple_metadata.cc    |  5 +-
 test/core/end2end/tests/simple_request.cc     |  4 +-
 .../end2end/tests/streaming_error_response.cc |  5 +-
 .../tests/timeout_before_request_call.cc      |  8 ++-
 test/core/end2end/tests/trailing_metadata.cc  |  5 +-
 test/core/end2end/tests/write_buffering.cc    |  7 ++-
 .../end2end/tests/write_buffering_at_end.cc   |  7 ++-
 test/core/event_engine/cf/cf_engine_test.cc   |  7 ++-
 .../core/event_engine/common_closures_test.cc |  5 +-
 .../default_engine_methods_test.cc            | 13 +++--
 .../core/event_engine/endpoint_config_test.cc |  5 +-
 .../event_engine/event_engine_test_utils.cc   | 12 ++---
 .../event_engine/event_engine_test_utils.h    |  7 ++-
 test/core/event_engine/factory_test.cc        |  7 ++-
 test/core/event_engine/forkable_test.cc       |  1 -
 .../fuzzing_event_engine.cc                   |  6 +--
 .../fuzzing_event_engine.h                    | 12 ++---
 .../fuzzing_event_engine_unittest.cc          |  5 +-
 test/core/event_engine/handle_tests.cc        |  6 +--
 test/core/event_engine/mock_event_engine.h    |  8 +--
 .../posix/event_poller_posix_test.cc          | 10 ++--
 .../posix/lock_free_event_test.cc             | 10 ++--
 .../posix/log_too_many_open_files_test.cc     |  1 -
 .../event_engine/posix/posix_endpoint_test.cc |  9 ++--
 .../posix/posix_engine_listener_utils_test.cc |  5 +-
 .../posix/posix_engine_test_utils.cc          |  1 -
 .../posix/posix_engine_test_utils.h           |  5 +-
 .../posix/posix_event_engine_connect_test.cc  |  8 ++-
 .../posix/tcp_posix_socket_utils_test.cc      |  7 +--
 .../event_engine/posix/timer_heap_test.cc     |  1 -
 .../event_engine/posix/timer_list_test.cc     |  7 ++-
 .../event_engine/posix/timer_manager_test.cc  |  5 +-
 .../posix/traced_buffer_list_test.cc          |  6 +--
 .../posix/wakeup_fd_posix_test.cc             |  1 -
 .../event_engine/query_extensions_test.cc     |  9 ++--
 test/core/event_engine/slice_buffer_test.cc   | 11 ++--
 test/core/event_engine/smoke_test.cc          |  9 ++--
 .../event_engine/tcp_socket_utils_test.cc     |  6 +--
 test/core/event_engine/test_init.cc           |  4 +-
 test/core/event_engine/test_init.h            |  4 +-
 .../test_suite/event_engine_test_framework.cc |  3 +-
 .../test_suite/event_engine_test_framework.h  |  7 ++-
 .../test_suite/fuzzing_event_engine_test.cc   |  4 +-
 .../posix/oracle_event_engine_posix.cc        |  6 +--
 .../posix/oracle_event_engine_posix.h         | 11 ++--
 .../posix_event_engine_native_dns_test.cc     |  7 ++-
 .../test_suite/posix_event_engine_test.cc     |  5 +-
 .../test_suite/tests/client_test.cc           |  9 ++--
 .../event_engine/test_suite/tests/dns_test.cc |  7 ++-
 .../test_suite/tests/server_test.cc           |  9 ++--
 .../test_suite/tests/timer_test.cc            |  5 +-
 .../thready_posix_event_engine_test.cc        |  5 +-
 .../test_suite/tools/echo_client.cc           | 14 +++--
 .../tools/posix_event_engine_factory.cc       |  7 ++-
 .../tools/windows_event_engine_factory.cc     |  6 +--
 test/core/event_engine/thread_pool_test.cc    |  7 ++-
 .../event_engine/util/aborting_event_engine.h |  9 ++--
 .../event_engine/windows/create_sockpair.cc   |  1 -
 test/core/event_engine/windows/iocp_test.cc   | 10 ++--
 .../event_engine/windows/win_socket_test.cc   |  6 +--
 .../windows/windows_endpoint_test.cc          |  6 +--
 .../work_queue/basic_work_queue_fuzzer.cc     |  6 +--
 .../work_queue/basic_work_queue_test.cc       |  7 ++-
 test/core/experiments/experiments_tag_test.cc |  5 +-
 test/core/experiments/experiments_test.cc     |  5 +-
 .../resolver_fuzzer.cc                        |  7 ++-
 .../rbac/rbac_service_config_parser_test.cc   |  9 ++--
 test/core/filters/bm_http_client_filter.cc    |  4 +-
 test/core/filters/client_auth_filter_test.cc  | 11 ++--
 .../filters/client_authority_filter_test.cc   |  5 +-
 test/core/filters/filter_test.cc              |  5 +-
 test/core/filters/filter_test.h               |  9 ++--
 test/core/filters/filter_test_test.cc         |  5 +-
 .../filters/gcp_authentication_filter_test.cc |  1 -
 test/core/handshake/client_ssl.cc             | 26 ++++-----
 test/core/handshake/http_proxy_mapper_test.cc |  5 +-
 .../readahead_handshaker_server_ssl.cc        |  5 +-
 test/core/handshake/server_ssl.cc             |  1 -
 test/core/handshake/server_ssl_common.cc      | 25 ++++-----
 test/core/handshake/verify_peer_options.cc    | 15 +++---
 test/core/http/format_request_test.cc         |  1 -
 test/core/http/httpcli_test.cc                | 19 +++----
 test/core/http/httpcli_test_util.cc           | 10 ++--
 test/core/http/httpscli_test.cc               | 15 +++---
 test/core/http/parser_test.cc                 |  4 +-
 test/core/http/request_fuzzer.cc              |  5 +-
 test/core/http/response_fuzzer.cc             |  5 +-
 test/core/iomgr/buffer_list_test.cc           |  6 +--
 test/core/iomgr/combiner_test.cc              |  7 ++-
 test/core/iomgr/endpoint_pair_test.cc         | 12 ++---
 test/core/iomgr/endpoint_tests.cc             |  8 ++-
 test/core/iomgr/error_test.cc                 |  9 ++--
 test/core/iomgr/fd_conservation_posix_test.cc |  4 +-
 test/core/iomgr/fd_posix_test.cc              | 10 ++--
 .../grpc_ipv6_loopback_available_test.cc      |  3 +-
 .../iomgr/pollset_windows_starvation_test.cc  |  4 +-
 test/core/iomgr/resolve_address_posix_test.cc | 13 ++---
 test/core/iomgr/resolve_address_test.cc       | 13 ++---
 test/core/iomgr/socket_utils_test.cc          |  9 ++--
 test/core/iomgr/tcp_client_posix_test.cc      |  8 ++-
 test/core/iomgr/tcp_posix_test.cc             | 12 ++---
 test/core/iomgr/tcp_server_posix_test.cc      |  9 ++--
 test/core/iomgr/timer_heap_test.cc            |  7 +--
 test/core/iomgr/timer_list_test.cc            |  4 +-
 test/core/json/fuzzer.cc                      |  4 +-
 test/core/json/json_object_loader_test.cc     |  5 +-
 test/core/json/json_test.cc                   |  1 -
 test/core/load_balancing/bm_picker.cc         |  8 ++-
 test/core/load_balancing/lb_policy_test_lib.h | 10 ++--
 ...outlier_detection_lb_config_parser_test.cc |  5 +-
 .../load_balancing/outlier_detection_test.cc  |  6 +--
 test/core/load_balancing/pick_first_test.cc   |  6 +--
 test/core/load_balancing/ring_hash_test.cc    |  6 +--
 .../rls_lb_config_parser_test.cc              |  5 +-
 test/core/load_balancing/round_robin_test.cc  |  5 +-
 .../static_stride_scheduler_benchmark.cc      |  5 +-
 .../weighted_round_robin_config_test.cc       |  5 +-
 .../weighted_round_robin_test.cc              |  6 +--
 ...xds_override_host_lb_config_parser_test.cc |  5 +-
 .../load_balancing/xds_override_host_test.cc  |  6 +--
 test/core/memory_usage/callback_client.cc     | 12 ++---
 test/core/memory_usage/callback_server.cc     | 12 ++---
 test/core/memory_usage/client.cc              | 22 ++++----
 test/core/memory_usage/memory_usage_test.cc   | 12 ++---
 test/core/memory_usage/server.cc              | 21 ++++----
 .../message_size_service_config_test.cc       |  6 +--
 test/core/nanopb/fuzzer_response.cc           |  3 +-
 test/core/nanopb/fuzzer_serverlist.cc         |  3 +-
 .../network_benchmarks/low_level_ping_pong.cc |  6 +--
 test/core/promise/activity_test.cc            |  1 -
 test/core/promise/arena_promise_test.cc       |  5 +-
 test/core/promise/bm_party.cc                 |  1 -
 test/core/promise/cancel_callback_test.cc     |  1 -
 .../event_engine_wakeup_scheduler_test.cc     |  6 +--
 .../promise/exec_ctx_wakeup_scheduler_test.cc |  1 -
 test/core/promise/for_each_test.cc            |  5 +-
 .../core/promise/inter_activity_latch_test.cc |  5 +-
 test/core/promise/inter_activity_pipe_test.cc |  1 -
 test/core/promise/interceptor_list_test.cc    |  5 +-
 test/core/promise/join_test.cc                |  1 -
 test/core/promise/latch_test.cc               |  1 -
 test/core/promise/loop_test.cc                |  1 -
 test/core/promise/map_pipe_test.cc            |  5 +-
 test/core/promise/map_test.cc                 |  1 -
 test/core/promise/mpsc_test.cc                |  5 +-
 test/core/promise/observable_test.cc          |  5 +-
 test/core/promise/party_test.cc               |  8 ++-
 test/core/promise/pipe_test.cc                |  7 ++-
 test/core/promise/prioritized_race_test.cc    |  1 -
 test/core/promise/promise_factory_test.cc     |  1 -
 test/core/promise/promise_fuzzer.cc           |  1 -
 test/core/promise/promise_mutex_test.cc       |  1 -
 test/core/promise/race_test.cc                |  1 -
 test/core/promise/sleep_test.cc               |  5 +-
 test/core/promise/try_seq_metadata_test.cc    |  7 ++-
 test/core/promise/wait_for_callback_test.cc   |  1 -
 test/core/resolver/binder_resolver_test.cc    |  4 +-
 .../resolver/dns_resolver_cooldown_test.cc    | 16 +++---
 test/core/resolver/dns_resolver_test.cc       |  1 -
 test/core/resolver/endpoint_addresses_test.cc |  5 +-
 test/core/resolver/fake_resolver_test.cc      |  4 +-
 .../core/resolver/google_c2p_resolver_test.cc | 12 ++---
 test/core/resolver/sockaddr_resolver_test.cc  |  1 -
 test/core/resource_quota/arena_test.cc        |  6 +--
 .../resource_quota/memory_quota_fuzzer.cc     |  8 ++-
 .../memory_quota_stress_test.cc               |  6 +--
 test/core/resource_quota/memory_quota_test.cc |  7 ++-
 .../resource_quota/periodic_update_test.cc    |  6 +--
 .../resource_quota/resource_quota_test.cc     |  1 -
 test/core/security/alts_credentials_fuzzer.cc |  6 +--
 .../security/alts_security_connector_test.cc  |  9 ++--
 test/core/security/auth_context_test.cc       |  4 +-
 .../security/authorization_matchers_test.cc   |  7 ++-
 test/core/security/aws_request_signer_test.cc |  4 +-
 .../certificate_provider_registry_test.cc     |  1 -
 .../security/channel_creds_registry_test.cc   |  4 +-
 .../check_gcp_environment_linux_test.cc       |  8 ++-
 .../check_gcp_environment_windows_test.cc     |  8 ++-
 test/core/security/create_jwt.cc              |  5 +-
 test/core/security/credentials_test.cc        | 21 ++++----
 test/core/security/evaluate_args_test.cc      |  3 +-
 test/core/security/fetch_oauth2.cc            | 10 ++--
 .../grpc_alts_credentials_options_test.cc     |  6 +--
 test/core/security/grpc_audit_logging_test.cc | 10 ++--
 .../grpc_authorization_engine_test.cc         |  7 ++-
 ...grpc_authorization_policy_provider_test.cc |  3 +-
 .../grpc_tls_certificate_distributor_test.cc  | 12 ++---
 .../grpc_tls_certificate_provider_test.cc     | 12 ++---
 .../grpc_tls_certificate_verifier_test.cc     | 12 ++---
 .../grpc_tls_credentials_options_test.cc      |  3 +-
 .../security/grpc_tls_crl_provider_test.cc    | 12 ++---
 .../insecure_security_connector_test.cc       |  3 +-
 test/core/security/json_token_test.cc         | 13 ++---
 test/core/security/jwt_verifier_test.cc       |  9 ++--
 .../security/local_security_connector_test.cc |  3 +-
 test/core/security/oauth2_utils.cc            |  6 +--
 .../print_google_default_creds_token.cc       |  8 ++-
 test/core/security/rbac_translator_test.cc    |  8 ++-
 test/core/security/secure_endpoint_test.cc    |  9 ++--
 test/core/security/security_connector_test.cc | 11 ++--
 test/core/security/ssl_credentials_test.cc    |  8 ++-
 test/core/security/ssl_server_fuzzer.cc       |  5 +-
 test/core/security/system_roots_test.cc       |  6 +--
 .../security/tls_security_connector_test.cc   | 11 ++--
 test/core/security/verify_jwt.cc              |  8 ++-
 test/core/security/xds_credentials_test.cc    |  3 +-
 .../server/server_config_selector_test.cc     |  5 +-
 .../server/xds_channel_stack_modifier_test.cc |  5 +-
 .../service_config/service_config_test.cc     |  4 +-
 test/core/slice/c_slice_buffer_test.cc        |  6 +--
 test/core/slice/percent_decode_fuzzer.cc      |  3 +-
 test/core/slice/percent_encode_fuzzer.cc      |  4 +-
 test/core/slice/percent_encoding_test.cc      |  4 +-
 test/core/slice/slice_buffer_test.cc          |  8 ++-
 test/core/slice/slice_string_helpers_test.cc  |  5 +-
 test/core/slice/slice_test.cc                 |  6 +--
 test/core/surface/byte_buffer_reader_test.cc  | 12 ++---
 test/core/surface/channel_init_test.cc        |  1 -
 test/core/surface/completion_queue_test.cc    |  8 ++-
 .../completion_queue_threading_test.cc        | 10 ++--
 .../surface/concurrent_connectivity_test.cc   | 14 +++--
 test/core/surface/init_test.cc                |  7 ++-
 test/core/surface/lame_client_test.cc         | 12 ++---
 ...num_external_connectivity_watchers_test.cc | 12 ++---
 .../surface/secure_channel_create_test.cc     |  5 +-
 .../surface/sequential_connectivity_test.cc   | 14 +++--
 test/core/surface/server_chttp2_test.cc       |  7 ++-
 test/core/surface/server_test.cc              | 12 ++---
 test/core/telemetry/call_tracer_test.cc       |  7 ++-
 test/core/telemetry/metrics_test.cc           |  1 -
 test/core/telemetry/stats_test.cc             |  5 +-
 test/core/telemetry/trace_flags_test.cc       |  5 +-
 test/core/test_util/audit_logging_utils.cc    |  9 ++--
 test/core/test_util/audit_logging_utils.h     |  8 +--
 test/core/test_util/cmdline.cc                |  4 +-
 test/core/test_util/cmdline.h                 |  4 +-
 test/core/test_util/cmdline_test.cc           |  1 -
 test/core/test_util/evaluate_args_test_util.h |  8 ++-
 test/core/test_util/fake_stats_plugin.cc      |  1 -
 test/core/test_util/fake_stats_plugin.h       |  1 -
 .../core/test_util/fake_udp_and_tcp_server.cc |  6 +--
 test/core/test_util/fake_udp_and_tcp_server.h |  6 +--
 .../test_util/fuzz_config_vars_helpers.cc     |  1 -
 .../core/test_util/fuzz_config_vars_helpers.h |  3 +-
 test/core/test_util/fuzzer_corpus_test.cc     |  6 +--
 test/core/test_util/fuzzer_util.cc            |  3 +-
 test/core/test_util/fuzzing_channel_args.h    |  4 +-
 test/core/test_util/histogram.cc              |  6 +--
 test/core/test_util/histogram.h               |  3 +-
 test/core/test_util/mock_endpoint.cc          |  9 ++--
 test/core/test_util/mock_endpoint.h           |  4 +-
 .../core/test_util/one_corpus_entry_fuzzer.cc |  4 +-
 test/core/test_util/parse_hexstring.cc        |  3 +-
 test/core/test_util/parse_hexstring.h         |  1 -
 test/core/test_util/passthrough_endpoint.h    |  4 +-
 test/core/test_util/port.cc                   |  8 ++-
 .../port_isolated_runtime_environment.cc      |  6 +--
 test/core/test_util/port_server_client.cc     | 16 +++---
 test/core/test_util/proto_bit_gen.h           |  3 +-
 test/core/test_util/reconnect_server.cc       |  6 +--
 test/core/test_util/reconnect_server.h        |  4 +-
 test/core/test_util/resolve_localhost_ip46.cc |  5 +-
 test/core/test_util/slice_splitter.cc         |  5 +-
 test/core/test_util/slice_splitter.h          |  3 +-
 .../socket_use_after_close_detector.cc        |  8 ++-
 .../socket_use_after_close_detector.h         |  6 +--
 test/core/test_util/stack_tracer.cc           |  5 +-
 test/core/test_util/stack_tracer.h            |  4 +-
 test/core/test_util/stack_tracer_test.cc      |  1 -
 test/core/test_util/test_config.cc            |  8 ++-
 test/core/test_util/test_config.h             |  3 +-
 test/core/test_util/test_lb_policies.cc       |  6 +--
 test/core/test_util/test_lb_policies.h        |  5 +-
 test/core/test_util/test_tcp_server.cc        | 10 ++--
 test/core/test_util/test_tcp_server.h         |  4 +-
 test/core/test_util/tls_utils.cc              |  8 ++-
 test/core/test_util/tls_utils.h               |  9 ++--
 test/core/transport/bdp_estimator_test.cc     |  4 +-
 .../transport/benchmarks/bm_chaotic_good.cc   |  4 +-
 test/core/transport/benchmarks/bm_inproc.cc   |  8 ++-
 .../transport/binder/binder_transport_test.cc | 10 ++--
 .../binder/end2end/binder_server_test.cc      | 12 ++---
 .../end2end/end2end_binder_transport_test.cc  | 10 ++--
 .../transport/binder/end2end/fake_binder.cc   |  1 -
 .../transport/binder/end2end/fake_binder.h    |  1 -
 .../binder/end2end/fake_binder_test.cc        |  7 ++-
 .../binder/end2end/fuzzers/client_fuzzer.cc   |  7 ++-
 .../binder/end2end/fuzzers/fuzzer_utils.h     |  1 -
 .../binder/end2end/fuzzers/server_fuzzer.cc   |  3 +-
 .../binder/end2end/testing_channel_create.cc  |  5 +-
 .../binder/end2end/testing_channel_create.h   |  4 +-
 .../binder/endpoint_binder_pool_test.cc       |  7 ++-
 .../binder/transport_stream_receiver_test.cc  |  7 ++-
 .../core/transport/binder/wire_reader_test.cc | 10 ++--
 .../core/transport/binder/wire_writer_test.cc |  8 ++-
 test/core/transport/bm_call_spine.cc          |  1 -
 .../transport/call_arena_allocator_test.cc    |  6 +--
 test/core/transport/call_filters_test.cc      |  1 -
 test/core/transport/call_spine_benchmarks.h   |  1 -
 test/core/transport/call_spine_test.cc        |  5 +-
 test/core/transport/call_state_test.cc        |  1 -
 .../chaotic_good/chaotic_good_server_test.cc  | 11 ++--
 .../client_transport_error_test.cc            | 14 +++--
 .../chaotic_good/client_transport_test.cc     | 15 +++---
 .../transport/chaotic_good/frame_fuzzer.cc    |  4 +-
 .../chaotic_good/frame_header_fuzzer.cc       |  1 -
 .../core/transport/chaotic_good/frame_test.cc |  1 -
 .../chaotic_good/mock_promise_endpoint.cc     |  4 +-
 .../chaotic_good/mock_promise_endpoint.h      |  5 +-
 .../chaotic_good/server_transport_test.cc     | 15 +++---
 .../transport/chaotic_good/transport_test.h   |  1 -
 test/core/transport/chttp2/alpn_test.cc       |  1 -
 .../core/transport/chttp2/bin_decoder_test.cc |  4 +-
 .../core/transport/chttp2/bin_encoder_test.cc |  9 ++--
 .../transport/chttp2/decode_huff_fuzzer.cc    |  1 -
 .../chttp2/encode_decode_huff_fuzzer.cc       |  4 +-
 .../transport/chttp2/flow_control_fuzzer.cc   |  6 +--
 .../transport/chttp2/flow_control_test.cc     |  5 +-
 test/core/transport/chttp2/frame_test.cc      |  1 -
 .../chttp2/graceful_shutdown_test.cc          | 14 +++--
 .../transport/chttp2/hpack_encoder_test.cc    |  6 +--
 .../chttp2/hpack_parser_fuzzer_test.cc        |  6 +--
 .../chttp2/hpack_parser_input_size_fuzzer.cc  | 10 ++--
 .../chttp2/hpack_parser_table_test.cc         |  5 +-
 .../transport/chttp2/hpack_parser_test.cc     | 13 +++--
 .../transport/chttp2/hpack_sync_fuzzer.cc     |  1 -
 .../core/transport/chttp2/hpack_utils_test.cc |  8 ++-
 .../chttp2/ping_abuse_policy_test.cc          |  4 +-
 .../transport/chttp2/ping_callbacks_test.cc   |  1 -
 .../chttp2/ping_configuration_test.cc         |  7 ++-
 .../transport/chttp2/ping_rate_policy_test.cc |  1 -
 .../remove_stream_from_stalled_lists_test.cc  | 25 ++++-----
 .../transport/chttp2/settings_timeout_test.cc | 22 ++++----
 ...ak_with_queued_flow_control_update_test.cc | 20 ++++---
 .../transport/chttp2/streams_not_seen_test.cc | 22 ++++----
 .../transport/chttp2/too_many_pings_test.cc   | 22 ++++----
 test/core/transport/chttp2/varint_test.cc     |  5 +-
 .../core/transport/connectivity_state_test.cc |  3 +-
 test/core/transport/error_utils_test.cc       |  1 -
 .../core/transport/interception_chain_test.cc |  7 ++-
 test/core/transport/metadata_map_test.cc      |  4 +-
 test/core/transport/parsed_metadata_test.cc   |  1 -
 test/core/transport/promise_endpoint_test.cc  |  9 ++--
 test/core/transport/status_conversion_test.cc |  5 +-
 .../core/transport/test_suite/call_content.cc |  1 -
 .../test_suite/chaotic_good_fixture.cc        |  1 -
 test/core/transport/test_suite/stress.cc      |  1 -
 .../transport/test_suite/transport_test.h     |  1 -
 test/core/transport/timeout_encoding_test.cc  |  1 -
 test/core/tsi/alts/crypt/aes_gcm_test.cc      |  8 ++-
 test/core/tsi/alts/crypt/gsec_test_util.cc    |  3 +-
 test/core/tsi/alts/crypt/gsec_test_util.h     |  3 +-
 .../fake_handshaker/fake_handshaker_server.cc | 15 +++---
 .../fake_handshaker/fake_handshaker_server.h  |  4 +-
 .../fake_handshaker_server_main.cc            |  7 ++-
 .../alts/frame_protector/alts_counter_test.cc |  3 +-
 .../alts/frame_protector/alts_crypter_test.cc |  7 +--
 .../alts_frame_protector_test.cc              |  6 +--
 .../frame_protector/frame_handler_test.cc     |  6 +--
 .../alts_concurrent_connectivity_test.cc      | 25 ++++-----
 .../handshaker/alts_handshaker_client_test.cc |  6 +--
 .../handshaker/alts_tsi_handshaker_test.cc    | 11 ++--
 .../alts/handshaker/alts_tsi_utils_test.cc    |  3 +-
 .../transport_security_common_api_test.cc     |  3 +-
 .../alts_grpc_record_protocol_test.cc         |  8 ++-
 .../alts_iovec_record_protocol_test.cc        |  8 ++-
 .../alts_zero_copy_grpc_protector_test.cc     |  6 +--
 .../tsi/crl_ssl_transport_security_test.cc    | 13 ++---
 test/core/tsi/fake_transport_security_test.cc |  8 ++-
 test/core/tsi/ssl_session_cache_test.cc       |  8 ++-
 test/core/tsi/ssl_transport_security_test.cc  | 15 +++---
 .../tsi/ssl_transport_security_utils_test.cc  |  9 ++--
 test/core/tsi/transport_security_test.cc      | 11 ++--
 test/core/tsi/transport_security_test_lib.cc  | 13 ++---
 test/core/tsi/transport_security_test_lib.h   |  3 +-
 test/core/util/alloc_test.cc                  |  4 +-
 test/core/util/backoff_test.cc                |  5 +-
 test/core/util/chunked_vector_fuzzer.cc       |  4 +-
 test/core/util/chunked_vector_test.cc         |  5 +-
 test/core/util/cpp_impl_of_test.cc            |  4 +-
 test/core/util/cpu_test.cc                    | 10 ++--
 test/core/util/directory_reader_test.cc       |  1 -
 test/core/util/dual_ref_counted_test.cc       |  1 -
 test/core/util/env_test.cc                    |  1 -
 test/core/util/fork_test.cc                   |  4 +-
 test/core/util/glob_test.cc                   |  5 +-
 test/core/util/gpr_time_test.cc               |  4 +-
 test/core/util/host_port_test.cc              |  1 -
 test/core/util/load_file_test.cc              |  4 +-
 test/core/util/mpscq_test.cc                  |  6 +--
 test/core/util/orphanable_test.cc             |  1 -
 test/core/util/ref_counted_ptr_test.cc        |  1 -
 test/core/util/ref_counted_test.cc            |  1 -
 test/core/util/ring_buffer_test.cc            |  4 +-
 test/core/util/spinlock_test.cc               |  6 +--
 test/core/util/stat_test.cc                   |  4 +-
 test/core/util/string_test.cc                 |  6 +--
 test/core/util/sync_test.cc                   |  8 ++-
 test/core/util/thd_test.cc                    |  7 ++-
 test/core/util/time_averaged_stats_test.cc    |  3 +-
 test/core/util/time_util_test.cc              |  4 +-
 test/core/util/unique_ptr_with_bitset_test.cc |  3 +-
 test/core/util/uri_fuzzer_test.cc             |  5 +-
 test/core/util/uri_test.cc                    |  5 +-
 test/core/util/useful_test.cc                 |  3 +-
 test/core/util/validation_errors_test.cc      |  1 -
 test/core/util/work_serializer_test.cc        |  8 ++-
 .../xds/certificate_provider_store_test.cc    |  5 +-
 ...tcher_certificate_provider_factory_test.cc |  5 +-
 .../xds/xds_audit_logger_registry_test.cc     | 14 +++--
 test/core/xds/xds_bootstrap_test.cc           | 10 ++--
 .../core/xds/xds_certificate_provider_test.cc |  5 +-
 test/core/xds/xds_client_fuzzer.cc            |  5 +-
 test/core/xds/xds_client_test.cc              | 15 +++---
 test/core/xds/xds_client_test_peer.h          |  5 +-
 .../xds/xds_cluster_resource_type_test.cc     | 16 +++---
 test/core/xds/xds_common_types_test.cc        | 14 +++--
 .../xds/xds_endpoint_resource_type_test.cc    | 11 ++--
 test/core/xds/xds_http_filters_test.cc        | 22 ++++----
 test/core/xds/xds_lb_policy_registry_test.cc  | 12 ++---
 .../xds/xds_listener_resource_type_test.cc    | 16 +++---
 test/core/xds/xds_metadata_test.cc            |  7 ++-
 .../xds_route_config_resource_type_test.cc    | 17 +++---
 test/core/xds/xds_transport_fake.cc           |  7 ++-
 test/core/xds/xds_transport_fake.h            |  4 +-
 test/cpp/client/credentials_test.cc           | 10 ++--
 ...channel_with_active_connect_stress_test.cc | 15 +++---
 test/cpp/codegen/codegen_test_full.cc         |  3 +-
 test/cpp/codegen/golden_file_test.cc          |  5 +-
 test/cpp/codegen/proto_utils_test.cc          |  3 +-
 test/cpp/common/alarm_test.cc                 |  9 ++--
 test/cpp/common/alts_util_test.cc             |  6 +--
 .../cpp/common/auth_property_iterator_test.cc |  3 +-
 test/cpp/common/channel_arguments_test.cc     |  3 +-
 test/cpp/common/secure_auth_context_test.cc   |  3 +-
 test/cpp/common/time_jump_test.cc             |  7 +--
 test/cpp/common/timer_test.cc                 |  4 +-
 .../end2end/admin_services_end2end_test.cc    |  6 +--
 test/cpp/end2end/async_end2end_test.cc        | 19 ++++---
 test/cpp/end2end/cfstream_test.cc             | 20 ++++---
 test/cpp/end2end/channelz_service_test.cc     |  8 ++-
 .../end2end/client_callback_end2end_test.cc   | 24 ++++-----
 test/cpp/end2end/client_crash_test.cc         |  8 ++-
 test/cpp/end2end/client_crash_test_server.cc  |  9 ++--
 test/cpp/end2end/client_fork_test.cc          | 11 ++--
 .../client_interceptors_end2end_test.cc       | 14 +++--
 test/cpp/end2end/client_lb_end2end_test.cc    | 38 +++++++------
 .../end2end/connection_attempt_injector.cc    |  1 -
 .../end2end/context_allocator_end2end_test.cc | 22 ++++----
 test/cpp/end2end/crl_provider_test.cc         | 24 ++++-----
 test/cpp/end2end/delegating_channel_test.cc   |  9 ++--
 test/cpp/end2end/end2end_test.cc              | 19 ++++---
 test/cpp/end2end/exception_test.cc            |  9 ++--
 test/cpp/end2end/flaky_network_test.cc        | 22 ++++----
 test/cpp/end2end/generic_end2end_test.cc      | 12 ++---
 test/cpp/end2end/grpc_authz_end2end_test.cc   |  7 ++-
 test/cpp/end2end/grpclb_end2end_test.cc       | 26 +++++----
 .../end2end/health_service_end2end_test.cc    | 13 +++--
 test/cpp/end2end/hybrid_end2end_test.cc       | 14 +++--
 test/cpp/end2end/interceptors_util.cc         |  1 -
 test/cpp/end2end/interceptors_util.h          |  8 ++-
 .../end2end/message_allocator_end2end_test.cc | 24 ++++-----
 test/cpp/end2end/mock_test.cc                 | 14 +++--
 test/cpp/end2end/nonblocking_test.cc          |  9 ++--
 test/cpp/end2end/orca_service_end2end_test.cc | 10 ++--
 test/cpp/end2end/port_sharing_end2end_test.cc | 14 +++--
 .../end2end/proto_server_reflection_test.cc   |  9 ++--
 test/cpp/end2end/raw_end2end_test.cc          | 14 +++--
 .../resource_quota_end2end_stress_test.cc     | 16 +++---
 test/cpp/end2end/rls_end2end_test.cc          | 22 ++++----
 test/cpp/end2end/rls_server.cc                |  1 -
 test/cpp/end2end/rls_server.h                 |  1 -
 .../cpp/end2end/server_builder_plugin_test.cc | 10 ++--
 test/cpp/end2end/server_crash_test.cc         | 10 ++--
 test/cpp/end2end/server_crash_test_client.cc  |  9 ++--
 test/cpp/end2end/server_early_return_test.cc  |  3 +-
 .../server_interceptors_end2end_test.cc       | 14 +++--
 .../server_load_reporting_end2end_test.cc     | 10 ++--
 .../end2end/service_config_end2end_test.cc    | 28 +++++-----
 test/cpp/end2end/shutdown_test.cc             | 12 ++---
 test/cpp/end2end/ssl_credentials_test.cc      | 12 ++---
 test/cpp/end2end/streaming_throughput_test.cc | 15 +++---
 .../end2end/test_health_check_service_impl.h  |  6 +--
 test/cpp/end2end/test_service_impl.cc         | 12 ++---
 test/cpp/end2end/test_service_impl.h          | 14 +++--
 test/cpp/end2end/thread_stress_test.cc        | 14 +++--
 test/cpp/end2end/time_change_test.cc          | 15 +++---
 test/cpp/end2end/tls_credentials_test.cc      | 12 ++---
 test/cpp/end2end/tls_key_export_test.cc       | 15 +++---
 .../end2end/xds/xds_cluster_end2end_test.cc   |  7 ++-
 .../xds/xds_cluster_type_end2end_test.cc      |  8 ++-
 test/cpp/end2end/xds/xds_core_end2end_test.cc |  7 ++-
 .../xds/xds_credentials_end2end_test.cc       |  3 +-
 test/cpp/end2end/xds/xds_csds_end2end_test.cc | 12 ++---
 test/cpp/end2end/xds/xds_end2end_test.cc      | 32 ++++++-----
 test/cpp/end2end/xds/xds_end2end_test_lib.cc  | 10 ++--
 test/cpp/end2end/xds/xds_end2end_test_lib.h   | 22 ++++----
 .../end2end/xds/xds_fallback_end2end_test.cc  | 14 +++--
 .../xds/xds_fault_injection_end2end_test.cc   |  6 +--
 .../end2end/xds/xds_gcp_authn_end2end_test.cc |  5 +-
 .../xds/xds_outlier_detection_end2end_test.cc |  7 ++-
 .../xds/xds_override_host_end2end_test.cc     |  7 ++-
 .../xds/xds_pick_first_end2end_test.cc        | 11 ++--
 .../end2end/xds/xds_ring_hash_end2end_test.cc | 10 ++--
 test/cpp/end2end/xds/xds_rls_end2end_test.cc  |  5 +-
 .../end2end/xds/xds_routing_end2end_test.cc   |  7 ++-
 test/cpp/end2end/xds/xds_server.cc            |  1 -
 test/cpp/end2end/xds/xds_server.h             |  5 +-
 test/cpp/end2end/xds/xds_utils.cc             |  5 +-
 test/cpp/end2end/xds/xds_utils.h              |  1 -
 test/cpp/end2end/xds/xds_wrr_end2end_test.cc  | 12 ++---
 test/cpp/ext/chaotic_good_test.cc             |  3 +-
 test/cpp/ext/csm/csm_observability_test.cc    |  7 ++-
 test/cpp/ext/csm/mesh_id_test.cc              |  3 +-
 test/cpp/ext/csm/metadata_exchange_test.cc    |  7 ++-
 .../filters/census/constant_labels_test.cc    |  7 ++-
 test/cpp/ext/filters/census/library.h         |  7 ++-
 .../census/stats_plugin_end2end_test.cc       |  7 ++-
 test/cpp/ext/filters/logging/library.h        |  9 ++--
 .../logging_census_integration_test.cc        |  9 ++--
 test/cpp/ext/filters/logging/logging_test.cc  |  7 ++-
 .../ext/gcp/environment_autodetect_test.cc    |  5 +-
 test/cpp/ext/gcp/observability_config_test.cc |  5 +-
 .../gcp/observability_logging_sink_test.cc    |  1 -
 test/cpp/ext/gcp/observability_test.cc        |  5 +-
 test/cpp/ext/otel/otel_plugin_test.cc         |  7 ++-
 test/cpp/ext/otel/otel_test_library.cc        |  5 +-
 test/cpp/ext/otel/otel_test_library.h         |  9 ++--
 test/cpp/grpclb/grpclb_api_test.cc            |  8 ++-
 test/cpp/interop/backend_metrics_lb_policy.cc |  5 +-
 .../interop/backend_metrics_lb_policy_test.cc |  9 ++--
 test/cpp/interop/client.cc                    | 11 ++--
 test/cpp/interop/client_helper.cc             | 15 +++---
 test/cpp/interop/client_helper.h              |  8 +--
 test/cpp/interop/grpclb_fallback_test.cc      | 14 +++--
 test/cpp/interop/http2_client.cc              |  9 ++--
 test/cpp/interop/http2_client.h               |  4 +-
 test/cpp/interop/interop_client.cc            | 17 +++---
 test/cpp/interop/interop_client.h             |  6 +--
 test/cpp/interop/interop_server.cc            | 17 +++---
 test/cpp/interop/interop_test.cc              |  4 +-
 test/cpp/interop/istio_echo_server.cc         | 19 ++++---
 test/cpp/interop/istio_echo_server_lib.cc     |  7 ++-
 test/cpp/interop/istio_echo_server_test.cc    | 12 ++---
 test/cpp/interop/metrics_client.cc            |  5 +-
 test/cpp/interop/observability_client.cc      | 15 +++---
 .../observability_interop_server_bootstrap.cc |  4 +-
 test/cpp/interop/pre_stop_hook_server.cc      |  5 +-
 test/cpp/interop/pre_stop_hook_server_test.cc | 10 ++--
 test/cpp/interop/reconnect_interop_client.cc  | 11 ++--
 test/cpp/interop/reconnect_interop_server.cc  | 10 ++--
 test/cpp/interop/rpc_behavior_lb_policy.cc    |  5 +-
 test/cpp/interop/server_helper.cc             |  5 +-
 test/cpp/interop/server_helper.h              |  6 +--
 test/cpp/interop/stress_interop_client.cc     |  5 +-
 test/cpp/interop/stress_interop_client.h      |  4 +-
 test/cpp/interop/stress_test.cc               |  8 ++-
 test/cpp/interop/xds_federation_client.cc     |  7 ++-
 test/cpp/interop/xds_interop_client.cc        | 17 +++---
 test/cpp/interop/xds_interop_server.cc        |  9 ++--
 test/cpp/interop/xds_interop_server_lib.cc    | 11 ++--
 test/cpp/interop/xds_interop_server_lib.h     |  4 +-
 test/cpp/interop/xds_interop_server_test.cc   | 10 ++--
 test/cpp/interop/xds_stats_watcher.h          |  5 +-
 test/cpp/interop/xds_stats_watcher_test.cc    |  7 ++-
 test/cpp/microbenchmarks/bm_alarm.cc          |  1 -
 .../microbenchmarks/bm_basic_work_queue.cc    |  8 ++-
 test/cpp/microbenchmarks/bm_byte_buffer.cc    |  8 ++-
 test/cpp/microbenchmarks/bm_channel.cc        |  1 -
 test/cpp/microbenchmarks/bm_channel_args.cc   |  8 ++-
 test/cpp/microbenchmarks/bm_chttp2_hpack.cc   |  9 ++--
 test/cpp/microbenchmarks/bm_closure.cc        |  5 +-
 test/cpp/microbenchmarks/bm_cq.cc             |  4 +-
 .../microbenchmarks/bm_cq_multiple_threads.cc |  9 ++--
 .../microbenchmarks/bm_event_engine_run.cc    | 10 ++--
 test/cpp/microbenchmarks/bm_exec_ctx.cc       |  7 ++-
 test/cpp/microbenchmarks/bm_huffman_decode.cc |  5 +-
 .../microbenchmarks/bm_opencensus_plugin.cc   | 12 ++---
 test/cpp/microbenchmarks/bm_rng.cc            |  1 -
 test/cpp/microbenchmarks/bm_stats_plugin.cc   |  8 ++-
 test/cpp/microbenchmarks/bm_thread_pool.cc    | 10 ++--
 .../callback_streaming_ping_pong.h            |  5 +-
 .../microbenchmarks/callback_test_service.h   |  4 +-
 .../callback_unary_ping_pong.h                |  5 +-
 test/cpp/microbenchmarks/fullstack_fixtures.h |  3 +-
 .../fullstack_streaming_ping_pong.h           |  5 +-
 .../fullstack_streaming_pump.h                |  5 +-
 .../fullstack_unary_ping_pong.h               |  5 +-
 test/cpp/microbenchmarks/helpers.h            |  7 ++-
 test/cpp/naming/address_sorting_test.cc       | 15 +++---
 test/cpp/naming/cancel_ares_query_test.cc     | 17 +++---
 test/cpp/naming/resolver_component_test.cc    | 17 +++---
 ...resolver_component_tests_runner_invoker.cc | 12 ++---
 test/cpp/performance/writes_per_rpc_test.cc   | 14 +++--
 test/cpp/qps/benchmark_config.cc              |  5 +-
 test/cpp/qps/client.h                         | 12 ++---
 test/cpp/qps/client_async.cc                  | 15 +++---
 test/cpp/qps/client_callback.cc               | 13 +++--
 test/cpp/qps/client_sync.cc                   | 17 +++---
 test/cpp/qps/driver.cc                        | 13 +++--
 .../qps/inproc_sync_unary_ping_pong_test.cc   |  1 -
 test/cpp/qps/interarrival.h                   |  4 +-
 test/cpp/qps/json_run_localhost.cc            |  1 -
 test/cpp/qps/parse_json.cc                    |  1 -
 test/cpp/qps/qps_json_driver.cc               |  5 +-
 test/cpp/qps/qps_openloop_test.cc             |  1 -
 test/cpp/qps/qps_server_builder.h             |  4 +-
 test/cpp/qps/qps_worker.cc                    | 17 +++---
 test/cpp/qps/qps_worker.h                     |  4 +-
 test/cpp/qps/report.cc                        |  5 +-
 test/cpp/qps/report.h                         |  6 +--
 test/cpp/qps/scenario_runner.cc               |  1 -
 .../qps/secure_sync_unary_ping_pong_test.cc   |  1 -
 test/cpp/qps/server.h                         |  7 ++-
 test/cpp/qps/server_async.cc                  | 17 +++---
 test/cpp/qps/server_callback.cc               |  3 +-
 test/cpp/qps/server_sync.cc                   |  9 ++--
 test/cpp/qps/usage_timer.cc                   |  5 +-
 test/cpp/qps/worker.cc                        |  6 +--
 .../security/tls_certificate_verifier_test.cc |  7 ++-
 .../authorization_policy_provider_test.cc     |  3 +-
 test/cpp/server/credentials_test.cc           | 10 ++--
 .../load_reporter/get_cpu_stats_test.cc       |  3 +-
 .../load_reporter/load_data_store_test.cc     |  9 ++--
 .../load_reporter/load_reporter_test.cc       | 12 ++---
 test/cpp/server/server_builder_test.cc        |  6 +--
 ...server_builder_with_socket_mutator_test.cc |  7 ++-
 test/cpp/server/server_request_call_test.cc   | 12 ++---
 .../cpp/test/client_context_test_peer_test.cc |  9 ++--
 test/cpp/test/mock_stream_test.cc             |  4 +-
 .../test/server_context_test_spouse_test.cc   |  9 ++--
 .../cpp/thread_manager/thread_manager_test.cc | 10 ++--
 test/cpp/util/byte_buffer_proto_helper.h      |  4 +-
 test/cpp/util/byte_buffer_test.cc             |  9 ++--
 test/cpp/util/channel_trace_proto_helper.cc   |  3 +-
 test/cpp/util/channelz_sampler.cc             | 26 +++++----
 test/cpp/util/channelz_sampler_test.cc        | 26 +++++----
 test/cpp/util/cli_call.cc                     | 11 ++--
 test/cpp/util/cli_call.h                      |  4 +-
 test/cpp/util/cli_call_test.cc                |  3 +-
 test/cpp/util/cli_credentials.cc              |  5 +-
 test/cpp/util/create_test_channel.cc          |  5 +-
 test/cpp/util/create_test_channel.h           |  4 +-
 test/cpp/util/error_details_test.cc           |  3 +-
 test/cpp/util/grpc_cli.cc                     |  5 +-
 test/cpp/util/grpc_tool.cc                    | 17 +++---
 test/cpp/util/grpc_tool.h                     |  4 +-
 test/cpp/util/grpc_tool_test.cc               | 16 +++---
 test/cpp/util/metrics_server.cc               |  3 +-
 test/cpp/util/metrics_server.h                |  4 +-
 test/cpp/util/proto_buffer_reader_test.cc     |  3 +-
 test/cpp/util/proto_buffer_writer_test.cc     |  3 +-
 test/cpp/util/proto_file_parser.cc            |  4 +-
 test/cpp/util/proto_file_parser.h             |  4 +-
 .../proto_reflection_descriptor_database.cc   |  1 -
 .../proto_reflection_descriptor_database.h    |  6 +--
 test/cpp/util/slice_test.cc                   |  3 +-
 test/cpp/util/string_ref_test.cc              |  6 +--
 test/cpp/util/test_config_cc.cc               |  1 -
 test/cpp/util/test_credentials_provider.cc    |  7 ++-
 test/cpp/util/test_credentials_provider.h     |  4 +-
 test/cpp/util/time_test.cc                    |  3 +-
 test/cpp/util/tls_test_utils.h                |  4 +-
 test/cpp/util/windows/manifest_file.cc        |  1 -
 .../python/grpcio_tools/grpc_tools/main.cc    | 15 +++---
 2150 files changed, 5746 insertions(+), 9439 deletions(-)
 delete mode 100644 include/grpc++/impl/.clang-format
 delete mode 100644 include/grpc/.clang-format
 delete mode 100644 include/grpcpp/.clang-format
 delete mode 100644 include/grpcpp/impl/.clang-format
 delete mode 100644 include/grpcpp/impl/codegen/.clang-format
 delete mode 100644 include/grpcpp/security/.clang-format
 delete mode 100644 include/grpcpp/support/.clang-format
 delete mode 100644 src/.clang-format
 delete mode 100644 src/compiler/.clang-format
 delete mode 100644 src/core/.clang-format
 delete mode 100644 src/core/client_channel/.clang-format
 delete mode 100644 src/core/ext/.clang-format
 delete mode 100644 src/core/ext/filters/.clang-format
 delete mode 100644 src/core/ext/transport/.clang-format
 delete mode 100644 src/core/ext/transport/binder/.clang-format
 delete mode 100644 src/core/ext/transport/chttp2/transport/.clang-format
 delete mode 100644 src/core/lib/event_engine/posix_engine/.clang-format
 delete mode 100644 src/core/lib/event_engine/windows/.clang-format
 delete mode 100644 src/core/load_balancing/.clang-format
 delete mode 100644 src/core/resolver/.clang-format
 delete mode 100644 src/core/util/.clang-format

diff --git a/.clang-format b/.clang-format
index 5f150ef6edb..6c6c4548e80 100644
--- a/.clang-format
+++ b/.clang-format
@@ -8,36 +8,6 @@ IncludeCategories:
   # ruby.h is even more first if it's included
   - Regex: '^<ruby/ruby.h>'
     Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
 ---
 Language: ObjC
 BasedOnStyle: Google
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
index fe7d910f1b4..3cb8637eb69 100644
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
@@ -13,14 +13,13 @@
 // limitations under the License.
 
 #include <android/log.h>
+#include <grpcpp/create_channel_binder.h>
+#include <grpcpp/security/binder_security_policy.h>
 #include <jni.h>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "examples/protos/helloworld.pb.h"
 
-#include <grpcpp/create_channel_binder.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 extern "C" JNIEXPORT jstring JNICALL
 Java_io_grpc_binder_cpp_exampleclient_ButtonPressHandler_native_1entry(
     JNIEnv* env, jobject /*this*/, jobject application) {
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
index 8b2e546ab2c..0f220c1066c 100644
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
+++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 
 #include <android/log.h>
-#include <jni.h>
-
-#include "examples/protos/helloworld.grpc.pb.h"
-#include "examples/protos/helloworld.pb.h"
-
 #include <grpcpp/create_channel_binder.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/security/binder_credentials.h>
 #include <grpcpp/security/binder_security_policy.h>
+#include <jni.h>
+
+#include "examples/protos/helloworld.grpc.pb.h"
+#include "examples/protos/helloworld.pb.h"
 
 namespace {
 class GreeterService : public helloworld::Greeter::Service {
diff --git a/examples/cpp/auth/ssl_client.cc b/examples/cpp/auth/ssl_client.cc
index 95e94eb1dbe..9a0efcadaac 100644
--- a/examples/cpp/auth/ssl_client.cc
+++ b/examples/cpp/auth/ssl_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -26,8 +28,6 @@
 #include "absl/flags/parse.h"
 #include "helper.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/auth/ssl_server.cc b/examples/cpp/auth/ssl_server.cc
index dc76ecdc093..e9bf94cf890 100644
--- a/examples/cpp/auth/ssl_server.cc
+++ b/examples/cpp/auth/ssl_server.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -21,8 +23,6 @@
 #include "absl/strings/str_format.h"
 #include "helper.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/cancellation/client.cc b/examples/cpp/cancellation/client.cc
index 97c9f1fac48..d78c9da25ac 100644
--- a/examples/cpp/cancellation/client.cc
+++ b/examples/cpp/cancellation/client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -23,8 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/cancellation/server.cc b/examples/cpp/cancellation/server.cc
index 7c537976508..f2a468d6ad2 100644
--- a/examples/cpp/cancellation/server.cc
+++ b/examples/cpp/cancellation/server.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -21,8 +23,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/compression/greeter_client.cc b/examples/cpp/compression/greeter_client.cc
index b1ef4546d8a..95aa5a9c152 100644
--- a/examples/cpp/compression/greeter_client.cc
+++ b/examples/cpp/compression/greeter_client.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/compression/greeter_server.cc b/examples/cpp/compression/greeter_server.cc
index dc1b1f6530f..f27447b13d9 100644
--- a/examples/cpp/compression/greeter_server.cc
+++ b/examples/cpp/compression/greeter_server.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/csm/csm_greeter_client.cc b/examples/cpp/csm/csm_greeter_client.cc
index a689fdfa0d2..90d550a9928 100644
--- a/examples/cpp/csm/csm_greeter_client.cc
+++ b/examples/cpp/csm/csm_greeter_client.cc
@@ -16,6 +16,9 @@
  *
  */
 
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/string_ref.h>
 #include <sys/types.h>
 
 #include <chrono>
@@ -34,10 +37,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/string_ref.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/csm/csm_greeter_server.cc b/examples/cpp/csm/csm_greeter_server.cc
index 7f66a5cc9a9..0c6a47446b5 100644
--- a/examples/cpp/csm/csm_greeter_server.cc
+++ b/examples/cpp/csm/csm_greeter_server.cc
@@ -16,6 +16,13 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -27,14 +34,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/util/gethostname.h"
 
 #ifdef BAZEL_BUILD
diff --git a/examples/cpp/csm/observability/csm_greeter_client.cc b/examples/cpp/csm/observability/csm_greeter_client.cc
index 7040bc13f90..6d08d901e5a 100644
--- a/examples/cpp/csm/observability/csm_greeter_client.cc
+++ b/examples/cpp/csm/observability/csm_greeter_client.cc
@@ -16,6 +16,9 @@
  *
  */
 
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/string_ref.h>
 #include <sys/types.h>
 
 #include <chrono>
@@ -32,10 +35,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/string_ref.h>
-
 ABSL_FLAG(std::string, target, "xds:///helloworld:50051", "Target string");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
           "Prometheus exporter endpoint");
diff --git a/examples/cpp/csm/observability/csm_greeter_server.cc b/examples/cpp/csm/observability/csm_greeter_server.cc
index a3d7eccd978..cfae25d4c3d 100644
--- a/examples/cpp/csm/observability/csm_greeter_server.cc
+++ b/examples/cpp/csm/observability/csm_greeter_server.cc
@@ -16,6 +16,13 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -31,13 +38,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 ABSL_FLAG(int32_t, port, 50051, "Server port for service.");
 ABSL_FLAG(std::string, prometheus_endpoint, "localhost:9464",
           "Prometheus exporter endpoint");
diff --git a/examples/cpp/deadline/client.cc b/examples/cpp/deadline/client.cc
index 398be745733..7971ab77f45 100644
--- a/examples/cpp/deadline/client.cc
+++ b/examples/cpp/deadline/client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -23,8 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/deadline/server.cc b/examples/cpp/deadline/server.cc
index eae5c0e1d08..14f2bfafe8b 100644
--- a/examples/cpp/deadline/server.cc
+++ b/examples/cpp/deadline/server.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <chrono>
 #include <condition_variable>
 #include <iostream>
@@ -25,8 +27,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/debugging/crashing_greeter_client.cc b/examples/cpp/debugging/crashing_greeter_client.cc
index 732535539f1..490ebcec98e 100644
--- a/examples/cpp/debugging/crashing_greeter_client.cc
+++ b/examples/cpp/debugging/crashing_greeter_client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -19,8 +21,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/debugging/greeter_callback_server_admin.cc b/examples/cpp/debugging/greeter_callback_server_admin.cc
index 397503f4e6d..c2c776fa707 100644
--- a/examples/cpp/debugging/greeter_callback_server_admin.cc
+++ b/examples/cpp/debugging/greeter_callback_server_admin.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -20,11 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/error_details/greeter_client.cc b/examples/cpp/error_details/greeter_client.cc
index a86756d01ec..08e960c6fb5 100644
--- a/examples/cpp/error_details/greeter_client.cc
+++ b/examples/cpp/error_details/greeter_client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -22,12 +24,9 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "google/rpc/error_details.pb.h"
-
 #include "src/proto/grpc/status/status.pb.h"
 #else
 #include "error_details.pb.h"
diff --git a/examples/cpp/error_details/greeter_server.cc b/examples/cpp/error_details/greeter_server.cc
index 41f844ab5c1..30a2c2bdebe 100644
--- a/examples/cpp/error_details/greeter_server.cc
+++ b/examples/cpp/error_details/greeter_server.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -22,14 +26,9 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "google/rpc/error_details.pb.h"
-
 #include "src/proto/grpc/status/status.pb.h"
 #else
 #include "error_details.pb.h"
diff --git a/examples/cpp/error_handling/greeter_client.cc b/examples/cpp/error_handling/greeter_client.cc
index 551d8f66607..10824339bf3 100644
--- a/examples/cpp/error_handling/greeter_client.cc
+++ b/examples/cpp/error_handling/greeter_client.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -22,8 +24,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/error_handling/greeter_server.cc b/examples/cpp/error_handling/greeter_server.cc
index 79a527a516b..701530b1fa4 100644
--- a/examples/cpp/error_handling/greeter_server.cc
+++ b/examples/cpp/error_handling/greeter_server.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -22,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/client_flow_control_client.cc b/examples/cpp/flow_control/client_flow_control_client.cc
index 933489d7d04..053a0c120f4 100644
--- a/examples/cpp/flow_control/client_flow_control_client.cc
+++ b/examples/cpp/flow_control/client_flow_control_client.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <cstddef>
 #include <ostream>
 #include <string>
@@ -23,10 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpc/grpc.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/client_flow_control_server.cc b/examples/cpp/flow_control/client_flow_control_server.cc
index 31de9275d7c..c19e40693fb 100644
--- a/examples/cpp/flow_control/client_flow_control_server.cc
+++ b/examples/cpp/flow_control/client_flow_control_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
@@ -25,10 +29,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/server_flow_control_client.cc b/examples/cpp/flow_control/server_flow_control_client.cc
index 2c9b5938a48..82df2dc463b 100644
--- a/examples/cpp/flow_control/server_flow_control_client.cc
+++ b/examples/cpp/flow_control/server_flow_control_client.cc
@@ -16,16 +16,16 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <string>
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpc/grpc.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/flow_control/server_flow_control_server.cc b/examples/cpp/flow_control/server_flow_control_server.cc
index 75b71eb1e1a..f04a84e1969 100644
--- a/examples/cpp/flow_control/server_flow_control_server.cc
+++ b/examples/cpp/flow_control/server_flow_control_server.cc
@@ -15,6 +15,11 @@
  * limitations under the License.
  *
  */
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/support/status.h>
+
 #include <cstddef>
 #include <iostream>
 #include <memory>
@@ -24,11 +29,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/support/status.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/gcp_observability/helloworld/greeter_client.cc b/examples/cpp/gcp_observability/helloworld/greeter_client.cc
index 7b4d79fab1f..1412cf07cf3 100644
--- a/examples/cpp/gcp_observability/helloworld/greeter_client.cc
+++ b/examples/cpp/gcp_observability/helloworld/greeter_client.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/grpcpp.h>
+
 #include <chrono>
 #include <iostream>
 #include <memory>
@@ -25,9 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/gcp_observability/helloworld/greeter_server.cc b/examples/cpp/gcp_observability/helloworld/greeter_server.cc
index 5312d68708a..02570a1bfbd 100644
--- a/examples/cpp/gcp_observability/helloworld/greeter_server.cc
+++ b/examples/cpp/gcp_observability/helloworld/greeter_server.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <chrono>
 #include <csignal>
 #include <iostream>
@@ -27,11 +32,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/generic_api/greeter_client.cc b/examples/cpp/generic_api/greeter_client.cc
index 8435ad6c2e3..7afd5377e45 100644
--- a/examples/cpp/generic_api/greeter_client.cc
+++ b/examples/cpp/generic_api/greeter_client.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/generic/generic_stub.h>
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -22,9 +25,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/generic/generic_stub.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/generic_api/greeter_server.cc b/examples/cpp/generic_api/greeter_server.cc
index e2a9b3f8976..d4e9a837829 100644
--- a/examples/cpp/generic_api/greeter_server.cc
+++ b/examples/cpp/generic_api/greeter_server.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -22,9 +25,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/health/health_client.cc b/examples/cpp/health/health_client.cc
index 488dbdf4d31..15e04b84216 100644
--- a/examples/cpp/health/health_client.cc
+++ b/examples/cpp/health/health_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,11 +27,8 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
-
 #include "src/proto/grpc/health/v1/health.grpc.pb.h"
 #else
 #include "health.grpc.pb.h"
diff --git a/examples/cpp/health/health_server.cc b/examples/cpp/health/health_server.cc
index ac78435ea1e..aae879c027b 100644
--- a/examples/cpp/health/health_server.cc
+++ b/examples/cpp/health/health_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_async_client.cc b/examples/cpp/helloworld/greeter_async_client.cc
index 25417269085..e798c92bc0a 100644
--- a/examples/cpp/helloworld/greeter_async_client.cc
+++ b/examples/cpp/helloworld/greeter_async_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,8 +26,6 @@
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_async_client2.cc b/examples/cpp/helloworld/greeter_async_client2.cc
index 83662761837..fd43fa2bb64 100644
--- a/examples/cpp/helloworld/greeter_async_client2.cc
+++ b/examples/cpp/helloworld/greeter_async_client2.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -25,8 +27,6 @@
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_async_server.cc b/examples/cpp/helloworld/greeter_async_server.cc
index 9adefedf7d9..72267b3e822 100644
--- a/examples/cpp/helloworld/greeter_async_server.cc
+++ b/examples/cpp/helloworld/greeter_async_server.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -26,8 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_callback_client.cc b/examples/cpp/helloworld/greeter_callback_client.cc
index ae09066c0f6..547120918c2 100644
--- a/examples/cpp/helloworld/greeter_callback_client.cc
+++ b/examples/cpp/helloworld/greeter_callback_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_callback_server.cc b/examples/cpp/helloworld/greeter_callback_server.cc
index 0a1b4ea9318..d8363c8d493 100644
--- a/examples/cpp/helloworld/greeter_callback_server.cc
+++ b/examples/cpp/helloworld/greeter_callback_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_client.cc b/examples/cpp/helloworld/greeter_client.cc
index b97f0bd1da3..a022fa628a4 100644
--- a/examples/cpp/helloworld/greeter_client.cc
+++ b/examples/cpp/helloworld/greeter_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -23,8 +25,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/greeter_server.cc b/examples/cpp/helloworld/greeter_server.cc
index e35c4ac9eb9..1bdc84acdb3 100644
--- a/examples/cpp/helloworld/greeter_server.cc
+++ b/examples/cpp/helloworld/greeter_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/xds_greeter_client.cc b/examples/cpp/helloworld/xds_greeter_client.cc
index 093204ec3e0..455ba5c2de8 100644
--- a/examples/cpp/helloworld/xds_greeter_client.cc
+++ b/examples/cpp/helloworld/xds_greeter_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -23,8 +25,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/helloworld/xds_greeter_server.cc b/examples/cpp/helloworld/xds_greeter_server.cc
index c0bed68ff7a..f7266b81581 100644
--- a/examples/cpp/helloworld/xds_greeter_server.cc
+++ b/examples/cpp/helloworld/xds_greeter_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -25,12 +31,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/interceptors/caching_interceptor.h b/examples/cpp/interceptors/caching_interceptor.h
index b461524f6f4..cd979752e8f 100644
--- a/examples/cpp/interceptors/caching_interceptor.h
+++ b/examples/cpp/interceptors/caching_interceptor.h
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/support/client_interceptor.h>
+
 #include <map>
 
 #include "absl/log/check.h"
 
-#include <grpcpp/support/client_interceptor.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/keyvaluestore.grpc.pb.h"
 #else
diff --git a/examples/cpp/interceptors/client.cc b/examples/cpp/interceptors/client.cc
index 9c63c86c172..cc815db9698 100644
--- a/examples/cpp/interceptors/client.cc
+++ b/examples/cpp/interceptors/client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 
 #include "caching_interceptor.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/keyvaluestore.grpc.pb.h"
 #else
diff --git a/examples/cpp/interceptors/server.cc b/examples/cpp/interceptors/server.cc
index e865bbe02fe..f1d3941c10f 100644
--- a/examples/cpp/interceptors/server.cc
+++ b/examples/cpp/interceptors/server.cc
@@ -16,14 +16,14 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/server_interceptor.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/server_interceptor.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/keyvaluestore.grpc.pb.h"
 #else
diff --git a/examples/cpp/keepalive/greeter_callback_client.cc b/examples/cpp/keepalive/greeter_callback_client.cc
index 3df307b44b0..0e123155815 100644
--- a/examples/cpp/keepalive/greeter_callback_client.cc
+++ b/examples/cpp/keepalive/greeter_callback_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -26,8 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/keepalive/greeter_callback_server.cc b/examples/cpp/keepalive/greeter_callback_server.cc
index 17c3c402d75..9a34a5a65ae 100644
--- a/examples/cpp/keepalive/greeter_callback_server.cc
+++ b/examples/cpp/keepalive/greeter_callback_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -24,10 +28,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/load_balancing/greeter_client.cc b/examples/cpp/load_balancing/greeter_client.cc
index 25322dbfc95..f09598f350e 100644
--- a/examples/cpp/load_balancing/greeter_client.cc
+++ b/examples/cpp/load_balancing/greeter_client.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/load_balancing/greeter_server.cc b/examples/cpp/load_balancing/greeter_server.cc
index d021b54c4d1..93b8c91e0a0 100644
--- a/examples/cpp/load_balancing/greeter_server.cc
+++ b/examples/cpp/load_balancing/greeter_server.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/metadata/greeter_client.cc b/examples/cpp/metadata/greeter_client.cc
index 3784d2fa26a..f7592501f19 100644
--- a/examples/cpp/metadata/greeter_client.cc
+++ b/examples/cpp/metadata/greeter_client.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/metadata/greeter_server.cc b/examples/cpp/metadata/greeter_server.cc
index 19d8bb0d01d..d2a742f400f 100644
--- a/examples/cpp/metadata/greeter_server.cc
+++ b/examples/cpp/metadata/greeter_server.cc
@@ -16,12 +16,12 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/multiplex/multiplex_client.cc b/examples/cpp/multiplex/multiplex_client.cc
index 085d1334a8c..31b125047de 100644
--- a/examples/cpp/multiplex/multiplex_client.cc
+++ b/examples/cpp/multiplex/multiplex_client.cc
@@ -15,6 +15,8 @@
  * limitations under the License.
  *
  */
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "examples/protos/route_guide.grpc.pb.h"
diff --git a/examples/cpp/multiplex/multiplex_server.cc b/examples/cpp/multiplex/multiplex_server.cc
index e4cdc54ec1f..7c08e9e8b59 100644
--- a/examples/cpp/multiplex/multiplex_server.cc
+++ b/examples/cpp/multiplex/multiplex_server.cc
@@ -16,6 +16,10 @@
  *
  */
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <map>
 #include <memory>
@@ -25,10 +29,6 @@
 #include "absl/flags/parse.h"
 #include "absl/strings/str_format.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #include "examples/protos/route_guide.grpc.pb.h"
diff --git a/examples/cpp/orca/orca_server.cc b/examples/cpp/orca/orca_server.cc
index d05d763a6a5..9feac2636d1 100644
--- a/examples/cpp/orca/orca_server.cc
+++ b/examples/cpp/orca/orca_server.cc
@@ -15,6 +15,12 @@
  * limitations under the License.
  *
  */
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/orca_service.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/support/status.h>
+
 #include <cstddef>
 #include <iostream>
 #include <memory>
@@ -25,12 +31,6 @@
 #include "absl/strings/str_format.h"
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/orca_service.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/support/status.h>
-
 using grpc::CallbackServerContext;
 using grpc::Server;
 using grpc::ServerBuilder;
diff --git a/examples/cpp/otel/codelab/greeter_callback_client.cc b/examples/cpp/otel/codelab/greeter_callback_client.cc
index d9eab4e9edd..2f2f0fa3d27 100644
--- a/examples/cpp/otel/codelab/greeter_callback_client.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_client.cc
@@ -23,6 +23,9 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <mutex>
 #include <string>
@@ -33,9 +36,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/greeter_callback_client_solution.cc b/examples/cpp/otel/codelab/greeter_callback_client_solution.cc
index b7b507c509d..83015949e19 100644
--- a/examples/cpp/otel/codelab/greeter_callback_client_solution.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_client_solution.cc
@@ -23,6 +23,9 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <mutex>
 #include <string>
@@ -33,9 +36,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/greeter_callback_server.cc b/examples/cpp/otel/codelab/greeter_callback_server.cc
index bba7c9ce072..7abd5ff716d 100644
--- a/examples/cpp/otel/codelab/greeter_callback_server.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_server.cc
@@ -23,6 +23,11 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -34,11 +39,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/greeter_callback_server_solution.cc b/examples/cpp/otel/codelab/greeter_callback_server_solution.cc
index a53ab288af4..8a8373e35db 100644
--- a/examples/cpp/otel/codelab/greeter_callback_server_solution.cc
+++ b/examples/cpp/otel/codelab/greeter_callback_server_solution.cc
@@ -23,6 +23,11 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -34,11 +39,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/codelab/util.cc b/examples/cpp/otel/codelab/util.cc
index a8fcce95663..35a1fe35c8e 100644
--- a/examples/cpp/otel/codelab/util.cc
+++ b/examples/cpp/otel/codelab/util.cc
@@ -23,12 +23,12 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/grpcpp.h>
+
 #include "opentelemetry/sdk/metrics/view/instrument_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/view_factory.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/codelab/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/otel/greeter_callback_client.cc b/examples/cpp/otel/greeter_callback_client.cc
index f166bd9f5e6..0e4cf644779 100644
--- a/examples/cpp/otel/greeter_callback_client.cc
+++ b/examples/cpp/otel/greeter_callback_client.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <string>
 
 #include "absl/flags/flag.h"
@@ -31,8 +33,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/greeter_callback_server.cc b/examples/cpp/otel/greeter_callback_server.cc
index 408b52d685d..60fec863a4e 100644
--- a/examples/cpp/otel/greeter_callback_server.cc
+++ b/examples/cpp/otel/greeter_callback_server.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -34,8 +36,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/ostream/greeter_callback_client.cc b/examples/cpp/otel/ostream/greeter_callback_client.cc
index 24e141fd7b5..1437d57e522 100644
--- a/examples/cpp/otel/ostream/greeter_callback_client.cc
+++ b/examples/cpp/otel/ostream/greeter_callback_client.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <string>
 
 #include "absl/flags/flag.h"
@@ -33,8 +35,6 @@
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/ostream/greeter_callback_server.cc b/examples/cpp/otel/ostream/greeter_callback_server.cc
index ab539efd305..13ae436cbb4 100644
--- a/examples/cpp/otel/ostream/greeter_callback_server.cc
+++ b/examples/cpp/otel/ostream/greeter_callback_server.cc
@@ -23,6 +23,8 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -35,8 +37,6 @@
 #include "opentelemetry/sdk/metrics/export/periodic_exporting_metric_reader_factory.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
-#include <grpcpp/ext/otel_plugin.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #else
diff --git a/examples/cpp/otel/util.cc b/examples/cpp/otel/util.cc
index f844a044a6e..e75b4ec4e05 100644
--- a/examples/cpp/otel/util.cc
+++ b/examples/cpp/otel/util.cc
@@ -23,6 +23,10 @@
 #define HAVE_ABSEIL
 #endif
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <condition_variable>
 #include <mutex>
 
@@ -30,10 +34,6 @@
 #include "opentelemetry/sdk/metrics/view/meter_selector_factory.h"
 #include "opentelemetry/sdk/metrics/view/view_factory.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/cpp/otel/util.h"
 #include "examples/protos/helloworld.grpc.pb.h"
diff --git a/examples/cpp/reflection/reflection_server.cc b/examples/cpp/reflection/reflection_server.cc
index 8ef327bbee8..1b3a4f2fbe5 100644
--- a/examples/cpp/reflection/reflection_server.cc
+++ b/examples/cpp/reflection/reflection_server.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 
 #include "absl/flags/flag.h"
@@ -19,9 +22,6 @@
 #include "absl/strings/str_format.h"
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 using grpc::CallbackServerContext;
 using grpc::Server;
 using grpc::ServerBuilder;
diff --git a/examples/cpp/retry/client.cc b/examples/cpp/retry/client.cc
index 3d490f25d5c..94417f61a70 100644
--- a/examples/cpp/retry/client.cc
+++ b/examples/cpp/retry/client.cc
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/status.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "absl/strings/string_view.h"
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/status.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/retry/server.cc b/examples/cpp/retry/server.cc
index f6a8c602473..66d809d7972 100644
--- a/examples/cpp/retry/server.cc
+++ b/examples/cpp/retry/server.cc
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <iostream>
-#include <memory>
-#include <string>
-
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 
+#include <iostream>
+#include <memory>
+#include <string>
+
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_callback_client.cc b/examples/cpp/route_guide/route_guide_callback_client.cc
index d44e9fae2d3..8e0624fddae 100644
--- a/examples/cpp/route_guide/route_guide_callback_client.cc
+++ b/examples/cpp/route_guide/route_guide_callback_client.cc
@@ -16,6 +16,13 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+
 #include <chrono>
 #include <condition_variable>
 #include <iostream>
@@ -26,13 +33,6 @@
 #include <thread>
 
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_callback_server.cc b/examples/cpp/route_guide/route_guide_callback_server.cc
index c9ff97c8174..f97884e7b96 100644
--- a/examples/cpp/route_guide/route_guide_callback_server.cc
+++ b/examples/cpp/route_guide/route_guide_callback_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -29,12 +35,6 @@
 #include "absl/log/initialize.h"
 #include "absl/log/log.h"
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_client.cc b/examples/cpp/route_guide/route_guide_client.cc
index fd29a31e373..73983f458d9 100644
--- a/examples/cpp/route_guide/route_guide_client.cc
+++ b/examples/cpp/route_guide/route_guide_client.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+
 #include <chrono>
 #include <iostream>
 #include <memory>
@@ -24,12 +30,6 @@
 #include <thread>
 
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/route_guide/route_guide_server.cc b/examples/cpp/route_guide/route_guide_server.cc
index 0e29125881f..7a6a1c8ecaa 100644
--- a/examples/cpp/route_guide/route_guide_server.cc
+++ b/examples/cpp/route_guide/route_guide_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -24,12 +30,6 @@
 #include <string>
 
 #include "helper.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
 #ifdef BAZEL_BUILD
 #include "examples/protos/route_guide.grpc.pb.h"
 #else
diff --git a/examples/cpp/systemd_socket_activation/client.cc b/examples/cpp/systemd_socket_activation/client.cc
index 46cdb53defe..6d25f4abffe 100644
--- a/examples/cpp/systemd_socket_activation/client.cc
+++ b/examples/cpp/systemd_socket_activation/client.cc
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/grpcpp.h>
-
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Status;
diff --git a/examples/cpp/systemd_socket_activation/server.cc b/examples/cpp/systemd_socket_activation/server.cc
index 28ec68114a4..bdd19a873f3 100644
--- a/examples/cpp/systemd_socket_activation/server.cc
+++ b/examples/cpp/systemd_socket_activation/server.cc
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerContext;
diff --git a/examples/cpp/unix_abstract_sockets/client.cc b/examples/cpp/unix_abstract_sockets/client.cc
index 36f561e7cdb..d86202ec433 100644
--- a/examples/cpp/unix_abstract_sockets/client.cc
+++ b/examples/cpp/unix_abstract_sockets/client.cc
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/grpcpp.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/grpcpp.h>
-
 using grpc::Channel;
 using grpc::ClientContext;
 using grpc::Status;
diff --git a/examples/cpp/unix_abstract_sockets/server.cc b/examples/cpp/unix_abstract_sockets/server.cc
index 6d941a6fcc6..53fe378f9c2 100644
--- a/examples/cpp/unix_abstract_sockets/server.cc
+++ b/examples/cpp/unix_abstract_sockets/server.cc
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "examples/protos/helloworld.grpc.pb.h"
 
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-
 using grpc::Server;
 using grpc::ServerBuilder;
 using grpc::ServerContext;
diff --git a/examples/cpp/wait_for_ready/greeter_callback_client.cc b/examples/cpp/wait_for_ready/greeter_callback_client.cc
index 1c7865ed2bf..546a5d7f503 100644
--- a/examples/cpp/wait_for_ready/greeter_callback_client.cc
+++ b/examples/cpp/wait_for_ready/greeter_callback_client.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -26,8 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/xds/xds_greeter_client.cc b/examples/cpp/xds/xds_greeter_client.cc
index 4bf47e1057c..d60e3f17d81 100644
--- a/examples/cpp/xds/xds_greeter_client.cc
+++ b/examples/cpp/xds/xds_greeter_client.cc
@@ -16,6 +16,8 @@
  *
  */
 
+#include <grpcpp/grpcpp.h>
+
 #include <condition_variable>
 #include <iostream>
 #include <memory>
@@ -25,8 +27,6 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 
-#include <grpcpp/grpcpp.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/examples/cpp/xds/xds_greeter_server.cc b/examples/cpp/xds/xds_greeter_server.cc
index c35166c819e..1eb65162ac6 100644
--- a/examples/cpp/xds/xds_greeter_server.cc
+++ b/examples/cpp/xds/xds_greeter_server.cc
@@ -16,6 +16,12 @@
  *
  */
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/health_check_service_interface.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
@@ -25,12 +31,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/health_check_service_interface.h>
-#include <grpcpp/xds_server_builder.h>
-
 #ifdef BAZEL_BUILD
 #include "examples/protos/helloworld.grpc.pb.h"
 #else
diff --git a/include/grpc++/impl/.clang-format b/include/grpc++/impl/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpc++/impl/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpc/.clang-format b/include/grpc/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpc/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpc/compression.h b/include/grpc/compression.h
index 0f07a514b2b..0db81a2593a 100644
--- a/include/grpc/compression.h
+++ b/include/grpc/compression.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_COMPRESSION_H
 #define GRPC_COMPRESSION_H
 
-#include <stdlib.h>
-
 #include <grpc/impl/compression_types.h>  // IWYU pragma: export
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/credentials.h b/include/grpc/credentials.h
index b5814b913c4..8875dd115b6 100644
--- a/include/grpc/credentials.h
+++ b/include/grpc/credentials.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_CREDENTIALS_H
 #define GRPC_CREDENTIALS_H
 
-#include <stdbool.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/event_engine/endpoint_config.h b/include/grpc/event_engine/endpoint_config.h
index ea1699afc52..68dae44caee 100644
--- a/include/grpc/event_engine/endpoint_config.h
+++ b/include/grpc/event_engine/endpoint_config.h
@@ -14,13 +14,13 @@
 #ifndef GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H
 #define GRPC_EVENT_ENGINE_ENDPOINT_CONFIG_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/event_engine.h b/include/grpc/event_engine/event_engine.h
index 21a0c1c4826..410c109dfc2 100644
--- a/include/grpc/event_engine/event_engine.h
+++ b/include/grpc/event_engine/event_engine.h
@@ -14,12 +14,6 @@
 #ifndef GRPC_EVENT_ENGINE_EVENT_ENGINE_H
 #define GRPC_EVENT_ENGINE_EVENT_ENGINE_H
 
-#include <vector>
-
-#include "absl/functional/any_invocable.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/extensible.h>
 #include <grpc/event_engine/memory_allocator.h>
@@ -27,6 +21,12 @@
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 
+#include <vector>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+
 // TODO(vigneshbabu): Define the Endpoint::Write metrics collection system
 namespace grpc_event_engine {
 namespace experimental {
diff --git a/include/grpc/event_engine/extensible.h b/include/grpc/event_engine/extensible.h
index 9af4f37682b..2923bb6a077 100644
--- a/include/grpc/event_engine/extensible.h
+++ b/include/grpc/event_engine/extensible.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_EVENT_ENGINE_EXTENSIBLE_H
 #define GRPC_EVENT_ENGINE_EXTENSIBLE_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/internal/memory_allocator_impl.h b/include/grpc/event_engine/internal/memory_allocator_impl.h
index 91cba5a9491..721da86d0ac 100644
--- a/include/grpc/event_engine/internal/memory_allocator_impl.h
+++ b/include/grpc/event_engine/internal/memory_allocator_impl.h
@@ -14,15 +14,15 @@
 #ifndef GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H
 #define GRPC_EVENT_ENGINE_INTERNAL_MEMORY_ALLOCATOR_IMPL_H
 
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <type_traits>
 #include <vector>
 
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/memory_allocator.h b/include/grpc/event_engine/memory_allocator.h
index 3a347c3b5cf..d50404c71ab 100644
--- a/include/grpc/event_engine/memory_allocator.h
+++ b/include/grpc/event_engine/memory_allocator.h
@@ -14,6 +14,9 @@
 #ifndef GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H
 #define GRPC_EVENT_ENGINE_MEMORY_ALLOCATOR_H
 
+#include <grpc/event_engine/internal/memory_allocator_impl.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>  // for abort()
 
 #include <algorithm>
@@ -21,10 +24,6 @@
 #include <type_traits>
 #include <vector>
 
-#include <grpc/event_engine/internal/memory_allocator_impl.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/memory_request.h b/include/grpc/event_engine/memory_request.h
index 2ea7bc5c1ab..b705f030c50 100644
--- a/include/grpc/event_engine/memory_request.h
+++ b/include/grpc/event_engine/memory_request.h
@@ -14,12 +14,11 @@
 #ifndef GRPC_EVENT_ENGINE_MEMORY_REQUEST_H
 #define GRPC_EVENT_ENGINE_MEMORY_REQUEST_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/event_engine/slice.h b/include/grpc/event_engine/slice.h
index f4009648dc1..7e4b2f08f7a 100644
--- a/include/grpc/event_engine/slice.h
+++ b/include/grpc/event_engine/slice.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_EVENT_ENGINE_SLICE_H
 #define GRPC_EVENT_ENGINE_SLICE_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,10 +26,6 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 // This public slice definition largely based of the internal grpc_core::Slice
 // implementation. Changes to this implementation might warrant changes to the
 // internal grpc_core::Slice type as well.
diff --git a/include/grpc/event_engine/slice_buffer.h b/include/grpc/event_engine/slice_buffer.h
index 724c3d07292..f6d23d72e09 100644
--- a/include/grpc/event_engine/slice_buffer.h
+++ b/include/grpc/event_engine/slice_buffer.h
@@ -15,6 +15,12 @@
 #ifndef GRPC_EVENT_ENGINE_SLICE_BUFFER_H
 #define GRPC_EVENT_ENGINE_SLICE_BUFFER_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/impl/codegen/slice.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,13 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/utility/utility.h"
 
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/impl/codegen/slice.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
index d293907eac0..2b681889d10 100644
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@@ -19,8 +19,6 @@
 #ifndef GRPC_GRPC_H
 #define GRPC_GRPC_H
 
-#include <stddef.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/impl/connectivity_state.h>  // IWYU pragma: export
 #include <grpc/impl/grpc_types.h>          // IWYU pragma: export
@@ -29,6 +27,7 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/grpc_audit_logging.h b/include/grpc/grpc_audit_logging.h
index 4c30593f2fd..229df79165d 100644
--- a/include/grpc/grpc_audit_logging.h
+++ b/include/grpc/grpc_audit_logging.h
@@ -19,15 +19,15 @@
 #ifndef GRPC_GRPC_AUDIT_LOGGING_H
 #define GRPC_GRPC_AUDIT_LOGGING_H
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/grpc_crl_provider.h b/include/grpc/grpc_crl_provider.h
index 968d10b0600..e9a6db95cd9 100644
--- a/include/grpc/grpc_crl_provider.h
+++ b/include/grpc/grpc_crl_provider.h
@@ -19,16 +19,16 @@
 #ifndef GRPC_GRPC_CRL_PROVIDER_H
 #define GRPC_GRPC_CRL_PROVIDER_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/grpc_posix.h b/include/grpc/grpc_posix.h
index 3f59a4423d3..864ba979a9e 100644
--- a/include/grpc/grpc_posix.h
+++ b/include/grpc/grpc_posix.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_GRPC_POSIX_H
 #define GRPC_GRPC_POSIX_H
 
-#include <stddef.h>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/grpc_security.h b/include/grpc/grpc_security.h
index 11e08a6f4a1..f9a2d9d555d 100644
--- a/include/grpc/grpc_security.h
+++ b/include/grpc/grpc_security.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_GRPC_SECURITY_H
 #define GRPC_GRPC_SECURITY_H
 
-#include <stdbool.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/impl/call.h b/include/grpc/impl/call.h
index ea298f2ef5c..43b44b195f5 100644
--- a/include/grpc/impl/call.h
+++ b/include/grpc/impl/call.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_IMPL_CALL_H
 #define GRPC_IMPL_CALL_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
+
 // Run a callback in the call's EventEngine.
 // Internal-only
 void grpc_call_run_in_event_engine(const grpc_call* call,
diff --git a/include/grpc/impl/grpc_types.h b/include/grpc/impl/grpc_types.h
index b1305114eb1..02c79532939 100644
--- a/include/grpc/impl/grpc_types.h
+++ b/include/grpc/impl/grpc_types.h
@@ -21,14 +21,13 @@
 
 // IWYU pragma: private, include <grpc/grpc.h>
 
-#include <stddef.h>
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/impl/slice_type.h b/include/grpc/impl/slice_type.h
index 5e35446ef93..6d23f8abf4c 100644
--- a/include/grpc/impl/slice_type.h
+++ b/include/grpc/impl/slice_type.h
@@ -21,9 +21,8 @@
 
 // IWYU pragma: private, include <grpc/slice.h>
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 typedef struct grpc_slice grpc_slice;
 
diff --git a/include/grpc/passive_listener.h b/include/grpc/passive_listener.h
index fffc789dba0..234ac5d8364 100644
--- a/include/grpc/passive_listener.h
+++ b/include/grpc/passive_listener.h
@@ -14,10 +14,10 @@
 #ifndef GRPC_PASSIVE_LISTENER_H
 #define GRPC_PASSIVE_LISTENER_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
+
+#include <memory>
 // #include <grpc/support/port_platform.h>
 
 namespace grpc_core {
diff --git a/include/grpc/support/alloc.h b/include/grpc/support/alloc.h
index fdfa63c8e88..1ffd1966e7c 100644
--- a/include/grpc/support/alloc.h
+++ b/include/grpc/support/alloc.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SUPPORT_ALLOC_H
 #define GRPC_SUPPORT_ALLOC_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/grpc/support/json.h b/include/grpc/support/json.h
index 7b850e1cc28..2c96a7fb5ab 100644
--- a/include/grpc/support/json.h
+++ b/include/grpc/support/json.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SUPPORT_JSON_H
 #define GRPC_SUPPORT_JSON_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -27,8 +28,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/support/log.h b/include/grpc/support/log.h
index 92a41f0066e..10b3e6ff67a 100644
--- a/include/grpc/support/log.h
+++ b/include/grpc/support/log.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SUPPORT_LOG_H
 #define GRPC_SUPPORT_LOG_H
 
+#include <grpc/support/port_platform.h>
 #include <stdarg.h>
 #include <stdlib.h> /* for abort() */
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/grpc/support/metrics.h b/include/grpc/support/metrics.h
index 829db0a404f..62525756620 100644
--- a/include/grpc/support/metrics.h
+++ b/include/grpc/support/metrics.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SUPPORT_METRICS_H
 #define GRPC_SUPPORT_METRICS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_core {
 namespace experimental {
 
diff --git a/include/grpc/support/sync_posix.h b/include/grpc/support/sync_posix.h
index 5348bac951f..18b049d418d 100644
--- a/include/grpc/support/sync_posix.h
+++ b/include/grpc/support/sync_posix.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SUPPORT_SYNC_POSIX_H
 #define GRPC_SUPPORT_SYNC_POSIX_H
 
-#include <pthread.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync_generic.h>
+#include <pthread.h>
 
 #ifdef GRPC_ASAN_ENABLED
 /* The member |leak_checker| is used to check whether there is a memory leak
diff --git a/include/grpc/support/time.h b/include/grpc/support/time.h
index 7adbfcedd1f..9fc786d8f41 100644
--- a/include/grpc/support/time.h
+++ b/include/grpc/support/time.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SUPPORT_TIME_H
 #define GRPC_SUPPORT_TIME_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <time.h>
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/include/grpcpp/.clang-format b/include/grpcpp/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/alarm.h b/include/grpcpp/alarm.h
index bace15ec89c..86356909afd 100644
--- a/include/grpcpp/alarm.h
+++ b/include/grpcpp/alarm.h
@@ -21,8 +21,6 @@
 #ifndef GRPCPP_ALARM_H
 #define GRPCPP_ALARM_H
 
-#include <functional>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpcpp/completion_queue.h>
@@ -30,6 +28,8 @@
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/time.h>
 
+#include <functional>
+
 namespace grpc {
 
 /// Trigger a \a CompletionQueue event, or asynchronous callback execution,
diff --git a/include/grpcpp/channel.h b/include/grpcpp/channel.h
index aef567390d9..dacd27c38a4 100644
--- a/include/grpcpp/channel.h
+++ b/include/grpcpp/channel.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_CHANNEL_H
 #define GRPCPP_CHANNEL_H
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.h>
@@ -30,6 +28,8 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 struct grpc_channel;
 
 namespace grpc {
diff --git a/include/grpcpp/client_context.h b/include/grpcpp/client_context.h
index af3b533ed1b..7226fce06de 100644
--- a/include/grpcpp/client_context.h
+++ b/include/grpcpp/client_context.h
@@ -34,12 +34,6 @@
 #ifndef GRPCPP_CLIENT_CONTEXT_H
 #define GRPCPP_CLIENT_CONTEXT_H
 
-#include <map>
-#include <memory>
-#include <string>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/impl/compression_types.h>
 #include <grpc/impl/propagation_bits.h>
 #include <grpcpp/impl/create_auth_context.h>
@@ -54,6 +48,12 @@
 #include <grpcpp/support/string_ref.h>
 #include <grpcpp/support/time.h>
 
+#include <map>
+#include <memory>
+#include <string>
+
+#include "absl/log/absl_check.h"
+
 struct census_context;
 struct grpc_call;
 
diff --git a/include/grpcpp/completion_queue.h b/include/grpcpp/completion_queue.h
index 2bb391fccfc..2216dabb096 100644
--- a/include/grpcpp/completion_queue.h
+++ b/include/grpcpp/completion_queue.h
@@ -32,10 +32,6 @@
 #ifndef GRPCPP_COMPLETION_QUEUE_H
 #define GRPCPP_COMPLETION_QUEUE_H
 
-#include <list>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
@@ -47,6 +43,10 @@
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/sync.h>
 
+#include <list>
+
+#include "absl/log/absl_check.h"
+
 struct grpc_completion_queue;
 
 namespace grpc {
diff --git a/include/grpcpp/create_channel.h b/include/grpcpp/create_channel.h
index 83f905e776f..7b765b8966a 100644
--- a/include/grpcpp/create_channel.h
+++ b/include/grpcpp/create_channel.h
@@ -19,14 +19,14 @@
 #ifndef GRPCPP_CREATE_CHANNEL_H
 #define GRPCPP_CREATE_CHANNEL_H
 
-#include <memory>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 namespace grpc {
 /// Create a new \a Channel pointing to \a target.
 ///
diff --git a/include/grpcpp/create_channel_binder.h b/include/grpcpp/create_channel_binder.h
index 16616f31ca9..f19792a184a 100644
--- a/include/grpcpp/create_channel_binder.h
+++ b/include/grpcpp/create_channel_binder.h
@@ -19,16 +19,15 @@
 
 #ifdef GPR_ANDROID
 
+#include <grpcpp/channel.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <jni.h>
 
 #include <memory>
 
 #include "absl/strings/string_view.h"
 
-#include <grpcpp/channel.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <grpcpp/support/channel_arguments.h>
-
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/create_channel_posix.h b/include/grpcpp/create_channel_posix.h
index c4eb30c8d87..b6b06e8412a 100644
--- a/include/grpcpp/create_channel_posix.h
+++ b/include/grpcpp/create_channel_posix.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_CREATE_CHANNEL_POSIX_H
 #define GRPCPP_CREATE_CHANNEL_POSIX_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+
 namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
diff --git a/include/grpcpp/ext/call_metric_recorder.h b/include/grpcpp/ext/call_metric_recorder.h
index 303a35db14d..443f5e4e67e 100644
--- a/include/grpcpp/ext/call_metric_recorder.h
+++ b/include/grpcpp/ext/call_metric_recorder.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_EXT_CALL_METRIC_RECORDER_H
 #define GRPCPP_EXT_CALL_METRIC_RECORDER_H
 
+#include <grpcpp/impl/sync.h>
+#include <grpcpp/support/slice.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpcpp/impl/sync.h>
-#include <grpcpp/support/slice.h>
-
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/ext/csm_observability.h b/include/grpcpp/ext/csm_observability.h
index af7b42f4d1b..265d91949cd 100644
--- a/include/grpcpp/ext/csm_observability.h
+++ b/include/grpcpp/ext/csm_observability.h
@@ -19,6 +19,9 @@
 #ifndef GRPCPP_EXT_CSM_OBSERVABILITY_H
 #define GRPCPP_EXT_CSM_OBSERVABILITY_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
@@ -26,9 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "opentelemetry/metrics/meter_provider.h"
 
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/otel_plugin.h>
-
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/ext/gcp_observability.h b/include/grpcpp/ext/gcp_observability.h
index df270bec887..96d1aee2680 100644
--- a/include/grpcpp/ext/gcp_observability.h
+++ b/include/grpcpp/ext/gcp_observability.h
@@ -17,12 +17,12 @@
 #ifndef GRPCPP_EXT_GCP_OBSERVABILITY_H
 #define GRPCPP_EXT_GCP_OBSERVABILITY_H
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+
 namespace grpc {
 
 // GcpObservability objects follow the RAII idiom and help manage the lifetime
diff --git a/include/grpcpp/ext/health_check_service_server_builder_option.h b/include/grpcpp/ext/health_check_service_server_builder_option.h
index 85b661ee515..e328f434d1f 100644
--- a/include/grpcpp/ext/health_check_service_server_builder_option.h
+++ b/include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_EXT_HEALTH_CHECK_SERVICE_SERVER_BUILDER_OPTION_H
 #define GRPCPP_EXT_HEALTH_CHECK_SERVICE_SERVER_BUILDER_OPTION_H
 
-#include <memory>
-
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/server_builder_option.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 namespace grpc {
 
 class HealthCheckServiceServerBuilderOption : public ServerBuilderOption {
diff --git a/include/grpcpp/ext/orca_service.h b/include/grpcpp/ext/orca_service.h
index 83a676095dc..3a2dd1a84ae 100644
--- a/include/grpcpp/ext/orca_service.h
+++ b/include/grpcpp/ext/orca_service.h
@@ -17,12 +17,6 @@
 #ifndef GRPCPP_EXT_ORCA_SERVICE_H
 #define GRPCPP_EXT_ORCA_SERVICE_H
 
-#include <map>
-#include <string>
-
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
-
 #include <grpcpp/ext/server_metric_recorder.h>
 #include <grpcpp/impl/service_type.h>
 #include <grpcpp/impl/sync.h>
@@ -30,6 +24,12 @@
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/slice.h>
 
+#include <map>
+#include <string>
+
+#include "absl/time/time.h"
+#include "absl/types/optional.h"
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/ext/otel_plugin.h b/include/grpcpp/ext/otel_plugin.h
index 9de57fbb496..ffd6f6647c4 100644
--- a/include/grpcpp/ext/otel_plugin.h
+++ b/include/grpcpp/ext/otel_plugin.h
@@ -19,6 +19,10 @@
 #ifndef GRPCPP_EXT_OTEL_PLUGIN_H
 #define GRPCPP_EXT_OTEL_PLUGIN_H
 
+#include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -30,11 +34,6 @@
 #include "absl/strings/string_view.h"
 #include "opentelemetry/metrics/meter_provider.h"
 
-#include <grpc/support/metrics.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/support/channel_arguments.h>
-
 namespace grpc {
 namespace internal {
 class OpenTelemetryPluginBuilderImpl;
diff --git a/include/grpcpp/ext/proto_server_reflection_plugin.h b/include/grpcpp/ext/proto_server_reflection_plugin.h
index b1cbb5a67c2..fd10c3acfbd 100644
--- a/include/grpcpp/ext/proto_server_reflection_plugin.h
+++ b/include/grpcpp/ext/proto_server_reflection_plugin.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_EXT_PROTO_SERVER_REFLECTION_PLUGIN_H
 #define GRPCPP_EXT_PROTO_SERVER_REFLECTION_PLUGIN_H
 
-#include <memory>
-
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 namespace grpc {
 class ProtoServerReflection;
 class ProtoServerReflectionBackend;
diff --git a/include/grpcpp/ext/server_metric_recorder.h b/include/grpcpp/ext/server_metric_recorder.h
index d2ddaae9367..4741572c44c 100644
--- a/include/grpcpp/ext/server_metric_recorder.h
+++ b/include/grpcpp/ext/server_metric_recorder.h
@@ -19,13 +19,13 @@
 #ifndef GRPCPP_EXT_SERVER_METRIC_RECORDER_H
 #define GRPCPP_EXT_SERVER_METRIC_RECORDER_H
 
+#include <grpcpp/impl/sync.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <functional>
 #include <map>
 #include <memory>
 
-#include <grpcpp/impl/sync.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc_core {
 struct BackendMetricData;
 }  // namespace grpc_core
diff --git a/include/grpcpp/impl/.clang-format b/include/grpcpp/impl/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/impl/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/impl/call_op_set.h b/include/grpcpp/impl/call_op_set.h
index 5afa8272aa2..3ed80330e4b 100644
--- a/include/grpcpp/impl/call_op_set.h
+++ b/include/grpcpp/impl/call_op_set.h
@@ -19,13 +19,6 @@
 #ifndef GRPCPP_IMPL_CALL_OP_SET_H
 #define GRPCPP_IMPL_CALL_OP_SET_H
 
-#include <cstring>
-#include <map>
-#include <memory>
-
-#include "absl/log/absl_check.h"
-#include "absl/log/absl_log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/impl/grpc_types.h>
@@ -45,6 +38,13 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <cstring>
+#include <map>
+#include <memory>
+
+#include "absl/log/absl_check.h"
+#include "absl/log/absl_log.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/impl/channel_argument_option.h b/include/grpcpp/impl/channel_argument_option.h
index d1bf931c578..b4f411e3c51 100644
--- a/include/grpcpp/impl/channel_argument_option.h
+++ b/include/grpcpp/impl/channel_argument_option.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_IMPL_CHANNEL_ARGUMENT_OPTION_H
 #define GRPCPP_IMPL_CHANNEL_ARGUMENT_OPTION_H
 
-#include <map>
-#include <memory>
-
 #include <grpcpp/impl/server_builder_option.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <map>
+#include <memory>
+
 namespace grpc {
 
 std::unique_ptr<ServerBuilderOption> MakeChannelArgumentOption(
diff --git a/include/grpcpp/impl/codegen/.clang-format b/include/grpcpp/impl/codegen/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/impl/codegen/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/impl/create_auth_context.h b/include/grpcpp/impl/create_auth_context.h
index 10844bec92c..892da261a23 100644
--- a/include/grpcpp/impl/create_auth_context.h
+++ b/include/grpcpp/impl/create_auth_context.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_CREATE_AUTH_CONTEXT_H
 #define GRPCPP_IMPL_CREATE_AUTH_CONTEXT_H
 
-#include <memory>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <memory>
+
 namespace grpc {
 
 /// TODO(ctiller): not sure we want to make this a permanent thing
diff --git a/include/grpcpp/impl/delegating_channel.h b/include/grpcpp/impl/delegating_channel.h
index 802237f2efd..add88a23bb0 100644
--- a/include/grpcpp/impl/delegating_channel.h
+++ b/include/grpcpp/impl/delegating_channel.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_IMPL_DELEGATING_CHANNEL_H
 #define GRPCPP_IMPL_DELEGATING_CHANNEL_H
 
-#include <memory>
-
 #include <grpcpp/impl/channel_interface.h>
 
+#include <memory>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/impl/generic_stub_internal.h b/include/grpcpp/impl/generic_stub_internal.h
index ba8c929d8fe..efc57417713 100644
--- a/include/grpcpp/impl/generic_stub_internal.h
+++ b/include/grpcpp/impl/generic_stub_internal.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H
 #define GRPCPP_IMPL_GENERIC_STUB_INTERNAL_H
 
-#include <functional>
-
 #include <grpcpp/client_context.h>
 #include <grpcpp/impl/rpc_method.h>
 #include <grpcpp/support/byte_buffer.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/stub_options.h>
 
+#include <functional>
+
 namespace grpc {
 
 template <class RequestType, class ResponseType>
diff --git a/include/grpcpp/impl/grpc_library.h b/include/grpcpp/impl/grpc_library.h
index 6f20d2bf413..728dda84624 100644
--- a/include/grpcpp/impl/grpc_library.h
+++ b/include/grpcpp/impl/grpc_library.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_GRPC_LIBRARY_H
 #define GRPCPP_IMPL_GRPC_LIBRARY_H
 
-#include <iostream>
-
 #include <grpc/grpc.h>
 #include <grpcpp/impl/codegen/config.h>
 
+#include <iostream>
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/impl/interceptor_common.h b/include/grpcpp/impl/interceptor_common.h
index 2d4c56701d2..5686c792b77 100644
--- a/include/grpcpp/impl/interceptor_common.h
+++ b/include/grpcpp/impl/interceptor_common.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_IMPL_INTERCEPTOR_COMMON_H
 #define GRPCPP_IMPL_INTERCEPTOR_COMMON_H
 
-#include <array>
-#include <functional>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set_interface.h>
@@ -31,6 +26,11 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/server_interceptor.h>
 
+#include <array>
+#include <functional>
+
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 namespace internal {
 
diff --git a/include/grpcpp/impl/metadata_map.h b/include/grpcpp/impl/metadata_map.h
index 6241df0c259..c6407eaa208 100644
--- a/include/grpcpp/impl/metadata_map.h
+++ b/include/grpcpp/impl/metadata_map.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_METADATA_MAP_H
 #define GRPCPP_IMPL_METADATA_MAP_H
 
-#include <map>
-
 #include <grpc/grpc.h>
 #include <grpcpp/support/slice.h>
 
+#include <map>
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/impl/proto_utils.h b/include/grpcpp/impl/proto_utils.h
index d738ff3ab67..4a101ebe113 100644
--- a/include/grpcpp/impl/proto_utils.h
+++ b/include/grpcpp/impl/proto_utils.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_IMPL_PROTO_UTILS_H
 #define GRPCPP_IMPL_PROTO_UTILS_H
 
-#include <type_traits>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
@@ -34,6 +30,10 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
 
+#include <type_traits>
+
+#include "absl/log/absl_check.h"
+
 /// This header provides serialization and deserialization between gRPC
 /// messages serialized using protobuf and the C++ objects they represent.
 
diff --git a/include/grpcpp/impl/rpc_method.h b/include/grpcpp/impl/rpc_method.h
index e1dcd003367..bb47f45ec10 100644
--- a/include/grpcpp/impl/rpc_method.h
+++ b/include/grpcpp/impl/rpc_method.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_IMPL_RPC_METHOD_H
 #define GRPCPP_IMPL_RPC_METHOD_H
 
-#include <memory>
-
 #include <grpcpp/impl/codegen/channel_interface.h>
 
+#include <memory>
+
 namespace grpc {
 namespace internal {
 /// Descriptor of an RPC method
diff --git a/include/grpcpp/impl/rpc_service_method.h b/include/grpcpp/impl/rpc_service_method.h
index 6ab92c978e3..1b9911eca41 100644
--- a/include/grpcpp/impl/rpc_service_method.h
+++ b/include/grpcpp/impl/rpc_service_method.h
@@ -19,6 +19,11 @@
 #ifndef GRPCPP_IMPL_RPC_SERVICE_METHOD_H
 #define GRPCPP_IMPL_RPC_SERVICE_METHOD_H
 
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/byte_buffer.h>
+#include <grpcpp/support/config.h>
+#include <grpcpp/support/status.h>
+
 #include <climits>
 #include <functional>
 #include <map>
@@ -28,11 +33,6 @@
 #include "absl/log/absl_check.h"
 #include "absl/log/absl_log.h"
 
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/config.h>
-#include <grpcpp/support/status.h>
-
 namespace grpc {
 class ServerContextBase;
 namespace internal {
diff --git a/include/grpcpp/impl/server_builder_option.h b/include/grpcpp/impl/server_builder_option.h
index d5745c6fb0c..22a94fd6833 100644
--- a/include/grpcpp/impl/server_builder_option.h
+++ b/include/grpcpp/impl/server_builder_option.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_IMPL_SERVER_BUILDER_OPTION_H
 #define GRPCPP_IMPL_SERVER_BUILDER_OPTION_H
 
-#include <map>
-#include <memory>
-
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <map>
+#include <memory>
+
 namespace grpc {
 
 /// Interface to pass an option to a \a ServerBuilder.
diff --git a/include/grpcpp/impl/server_builder_plugin.h b/include/grpcpp/impl/server_builder_plugin.h
index d7ef0be5c29..bf4397b37ba 100644
--- a/include/grpcpp/impl/server_builder_plugin.h
+++ b/include/grpcpp/impl/server_builder_plugin.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_SERVER_BUILDER_PLUGIN_H
 #define GRPCPP_IMPL_SERVER_BUILDER_PLUGIN_H
 
-#include <memory>
-
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 namespace grpc {
 
 class ServerBuilder;
diff --git a/include/grpcpp/impl/server_callback_handlers.h b/include/grpcpp/impl/server_callback_handlers.h
index 7a4b6cf9aef..1c6104a51a8 100644
--- a/include/grpcpp/impl/server_callback_handlers.h
+++ b/include/grpcpp/impl/server_callback_handlers.h
@@ -18,8 +18,6 @@
 #ifndef GRPCPP_IMPL_SERVER_CALLBACK_HANDLERS_H
 #define GRPCPP_IMPL_SERVER_CALLBACK_HANDLERS_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
 #include <grpcpp/impl/rpc_service_method.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 namespace internal {
 
diff --git a/include/grpcpp/impl/server_initializer.h b/include/grpcpp/impl/server_initializer.h
index c2ad90bd269..2624681d165 100644
--- a/include/grpcpp/impl/server_initializer.h
+++ b/include/grpcpp/impl/server_initializer.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_IMPL_SERVER_INITIALIZER_H
 #define GRPCPP_IMPL_SERVER_INITIALIZER_H
 
+#include <grpcpp/server.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpcpp/server.h>
-
 namespace grpc {
 class Server;
 class Service;
diff --git a/include/grpcpp/impl/service_type.h b/include/grpcpp/impl/service_type.h
index b6af6e1fc98..f29f499f4e1 100644
--- a/include/grpcpp/impl/service_type.h
+++ b/include/grpcpp/impl/service_type.h
@@ -19,14 +19,14 @@
 #ifndef GRPCPP_IMPL_SERVICE_TYPE_H
 #define GRPCPP_IMPL_SERVICE_TYPE_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/impl/serialization_traits.h>
 #include <grpcpp/server_interface.h>
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 class CompletionQueue;
diff --git a/include/grpcpp/impl/sync.h b/include/grpcpp/impl/sync.h
index c4aa00bc07d..dcd4dcd1e86 100644
--- a/include/grpcpp/impl/sync.h
+++ b/include/grpcpp/impl/sync.h
@@ -25,14 +25,14 @@
 #include <pthread.h>
 #endif
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+
 #include <mutex>
 
 #include "absl/log/absl_check.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 // The core library is not accessible in C++ codegen headers, and vice versa.
 // Thus, we need to have duplicate headers with similar functionality.
 // Make sure any change to this file is also reflected in
diff --git a/include/grpcpp/security/.clang-format b/include/grpcpp/security/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/security/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/security/alts_context.h b/include/grpcpp/security/alts_context.h
index 2f2de4e8824..04f1a0501c1 100644
--- a/include/grpcpp/security/alts_context.h
+++ b/include/grpcpp/security/alts_context.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_SECURITY_ALTS_CONTEXT_H
 #define GRPCPP_SECURITY_ALTS_CONTEXT_H
 
-#include <map>
-#include <memory>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <map>
+#include <memory>
+
 struct grpc_gcp_AltsContext;
 
 namespace grpc {
diff --git a/include/grpcpp/security/alts_util.h b/include/grpcpp/security/alts_util.h
index c196823d1a8..a3df6474589 100644
--- a/include/grpcpp/security/alts_util.h
+++ b/include/grpcpp/security/alts_util.h
@@ -19,13 +19,13 @@
 #ifndef GRPCPP_SECURITY_ALTS_UTIL_H
 #define GRPCPP_SECURITY_ALTS_UTIL_H
 
-#include <memory>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/status.h>
 
+#include <memory>
+
 struct grpc_gcp_AltsContext;
 
 namespace grpc {
diff --git a/include/grpcpp/security/audit_logging.h b/include/grpcpp/security/audit_logging.h
index b29464a6907..cec7aa23c90 100644
--- a/include/grpcpp/security/audit_logging.h
+++ b/include/grpcpp/security/audit_logging.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SECURITY_AUDIT_LOGGING_H
 #define GRPCPP_SECURITY_AUDIT_LOGGING_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "absl/status/statusor.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/security/auth_context.h b/include/grpcpp/security/auth_context.h
index f6e3fae481b..90dbb5535fa 100644
--- a/include/grpcpp/security/auth_context.h
+++ b/include/grpcpp/security/auth_context.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_SECURITY_AUTH_CONTEXT_H
 #define GRPCPP_SECURITY_AUTH_CONTEXT_H
 
-#include <iterator>
-#include <vector>
-
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <iterator>
+#include <vector>
+
 struct grpc_auth_context;
 struct grpc_auth_property;
 struct grpc_auth_property_iterator;
diff --git a/include/grpcpp/security/auth_metadata_processor.h b/include/grpcpp/security/auth_metadata_processor.h
index c491a13b198..aab59056bab 100644
--- a/include/grpcpp/security/auth_metadata_processor.h
+++ b/include/grpcpp/security/auth_metadata_processor.h
@@ -19,12 +19,12 @@
 #ifndef GRPCPP_SECURITY_AUTH_METADATA_PROCESSOR_H
 #define GRPCPP_SECURITY_AUTH_METADATA_PROCESSOR_H
 
-#include <map>
-
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+
 namespace grpc {
 
 /// Interface allowing custom server-side authorization based on credentials
diff --git a/include/grpcpp/security/authorization_policy_provider.h b/include/grpcpp/security/authorization_policy_provider.h
index fe4f2c19f23..9bd916ff4b6 100644
--- a/include/grpcpp/security/authorization_policy_provider.h
+++ b/include/grpcpp/security/authorization_policy_provider.h
@@ -15,12 +15,12 @@
 #ifndef GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H
 #define GRPCPP_SECURITY_AUTHORIZATION_POLICY_PROVIDER_H
 
-#include <memory>
-
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
 #include <grpcpp/impl/codegen/status.h>
 
+#include <memory>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/security/binder_credentials.h b/include/grpcpp/security/binder_credentials.h
index f511837ef2e..3c38b5129d5 100644
--- a/include/grpcpp/security/binder_credentials.h
+++ b/include/grpcpp/security/binder_credentials.h
@@ -15,11 +15,11 @@
 #ifndef GRPCPP_SECURITY_BINDER_CREDENTIALS_H
 #define GRPCPP_SECURITY_BINDER_CREDENTIALS_H
 
-#include <memory>
-
 #include <grpcpp/security/binder_security_policy.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 namespace grpc {
 
 class ChannelCredentials;
diff --git a/include/grpcpp/security/credentials.h b/include/grpcpp/security/credentials.h
index d1f8c22846a..d3ff3c830d0 100644
--- a/include/grpcpp/security/credentials.h
+++ b/include/grpcpp/security/credentials.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_SECURITY_CREDENTIALS_H
 #define GRPCPP_SECURITY_CREDENTIALS_H
 
-#include <map>
-#include <memory>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/impl/grpc_library.h>
@@ -33,6 +29,10 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+#include <memory>
+#include <vector>
+
 struct grpc_call;
 
 namespace grpc {
diff --git a/include/grpcpp/security/server_credentials.h b/include/grpcpp/security/server_credentials.h
index aa602cf4e64..d75c62bd648 100644
--- a/include/grpcpp/security/server_credentials.h
+++ b/include/grpcpp/security/server_credentials.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SECURITY_SERVER_CREDENTIALS_H
 #define GRPCPP_SECURITY_SERVER_CREDENTIALS_H
 
-#include <memory>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <vector>
+
 struct grpc_server;
 
 namespace grpc {
diff --git a/include/grpcpp/security/tls_certificate_provider.h b/include/grpcpp/security/tls_certificate_provider.h
index fc34d67a6d5..7912e4ccd26 100644
--- a/include/grpcpp/security/tls_certificate_provider.h
+++ b/include/grpcpp/security/tls_certificate_provider.h
@@ -17,12 +17,6 @@
 #ifndef GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H
 #define GRPCPP_SECURITY_TLS_CERTIFICATE_PROVIDER_H
 
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
@@ -30,6 +24,12 @@
 #include <grpc/support/port_platform.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/status/statusor.h"
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/security/tls_certificate_verifier.h b/include/grpcpp/security/tls_certificate_verifier.h
index 5b87b1a42c6..34fbd998794 100644
--- a/include/grpcpp/security/tls_certificate_verifier.h
+++ b/include/grpcpp/security/tls_certificate_verifier.h
@@ -17,12 +17,6 @@
 #ifndef GRPCPP_SECURITY_TLS_CERTIFICATE_VERIFIER_H
 #define GRPCPP_SECURITY_TLS_CERTIFICATE_VERIFIER_H
 
-#include <functional>
-#include <map>
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpcpp/impl/grpc_library.h>
@@ -31,6 +25,12 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <functional>
+#include <map>
+#include <memory>
+#include <utility>
+#include <vector>
+
 // TODO(yihuazhang): remove the forward declaration here and include
 // <grpc/grpc_security.h> directly once the insecure builds are cleaned up.
 typedef struct grpc_tls_custom_verification_check_request
diff --git a/include/grpcpp/security/tls_credentials_options.h b/include/grpcpp/security/tls_credentials_options.h
index c47f348ccaa..b509af05c69 100644
--- a/include/grpcpp/security/tls_credentials_options.h
+++ b/include/grpcpp/security/tls_credentials_options.h
@@ -19,9 +19,6 @@
 #ifndef GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H
 #define GRPCPP_SECURITY_TLS_CREDENTIALS_OPTIONS_H
 
-#include <memory>
-#include <vector>
-
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
@@ -30,6 +27,9 @@
 #include <grpcpp/security/tls_crl_provider.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <vector>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h
index 3c56b6a06a2..37f71ff7d62 100644
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_SERVER_H
 #define GRPCPP_SERVER_H
 
-#include <list>
-#include <memory>
-#include <vector>
-
 #include <grpc/compression.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
@@ -39,6 +35,10 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 
+#include <list>
+#include <memory>
+#include <vector>
+
 struct grpc_server;
 
 namespace grpc {
diff --git a/include/grpcpp/server_builder.h b/include/grpcpp/server_builder.h
index 787cb20af7d..118861fa063 100644
--- a/include/grpcpp/server_builder.h
+++ b/include/grpcpp/server_builder.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SERVER_BUILDER_H
 #define GRPCPP_SERVER_BUILDER_H
 
-#include <climits>
-#include <map>
-#include <memory>
-#include <vector>
-
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/passive_listener.h>
@@ -40,6 +35,11 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/server_interceptor.h>
 
+#include <climits>
+#include <map>
+#include <memory>
+#include <vector>
+
 struct grpc_resource_quota;
 
 namespace grpc {
diff --git a/include/grpcpp/server_context.h b/include/grpcpp/server_context.h
index eb72e36b4af..00a3709f1dc 100644
--- a/include/grpcpp/server_context.h
+++ b/include/grpcpp/server_context.h
@@ -19,13 +19,6 @@
 #ifndef GRPCPP_SERVER_CONTEXT_H
 #define GRPCPP_SERVER_CONTEXT_H
 
-#include <atomic>
-#include <cassert>
-#include <map>
-#include <memory>
-#include <type_traits>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
 #include <grpc/impl/compression_types.h>
@@ -47,6 +40,13 @@
 #include <grpcpp/support/string_ref.h>
 #include <grpcpp/support/time.h>
 
+#include <atomic>
+#include <cassert>
+#include <map>
+#include <memory>
+#include <type_traits>
+#include <vector>
+
 struct grpc_metadata;
 struct grpc_call;
 struct census_context;
diff --git a/include/grpcpp/server_interface.h b/include/grpcpp/server_interface.h
index 9791ee3589c..3e6680f1767 100644
--- a/include/grpcpp/server_interface.h
+++ b/include/grpcpp/server_interface.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SERVER_INTERFACE_H
 #define GRPCPP_SERVER_INTERFACE_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
@@ -33,6 +31,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 class AsyncGenericService;
diff --git a/include/grpcpp/server_posix.h b/include/grpcpp/server_posix.h
index 8132c01cf94..0ccf560e063 100644
--- a/include/grpcpp/server_posix.h
+++ b/include/grpcpp/server_posix.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_SERVER_POSIX_H
 #define GRPCPP_SERVER_POSIX_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/server.h>
 
+#include <memory>
+
 namespace grpc {
 
 #ifdef GPR_SUPPORT_CHANNELS_FROM_FD
diff --git a/include/grpcpp/support/.clang-format b/include/grpcpp/support/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/include/grpcpp/support/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/include/grpcpp/support/async_stream.h b/include/grpcpp/support/async_stream.h
index c4cbb9dbb43..931d321a982 100644
--- a/include/grpcpp/support/async_stream.h
+++ b/include/grpcpp/support/async_stream.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_ASYNC_STREAM_H
 #define GRPCPP_SUPPORT_ASYNC_STREAM_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/channel_interface.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/support/async_unary_call.h b/include/grpcpp/support/async_unary_call.h
index a03a9b28382..b50798ae7cf 100644
--- a/include/grpcpp/support/async_unary_call.h
+++ b/include/grpcpp/support/async_unary_call.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_ASYNC_UNARY_CALL_H
 #define GRPCPP_SUPPORT_ASYNC_UNARY_CALL_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/impl/call.h>
@@ -31,6 +29,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 // Forward declaration for use in Helper class
diff --git a/include/grpcpp/support/byte_buffer.h b/include/grpcpp/support/byte_buffer.h
index 676d3cfad7e..c60326f036a 100644
--- a/include/grpcpp/support/byte_buffer.h
+++ b/include/grpcpp/support/byte_buffer.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_BYTE_BUFFER_H
 #define GRPCPP_SUPPORT_BYTE_BUFFER_H
 
-#include <vector>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpcpp/impl/serialization_traits.h>
@@ -28,6 +26,8 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
 
+#include <vector>
+
 namespace grpc {
 
 class ServerInterface;
diff --git a/include/grpcpp/support/callback_common.h b/include/grpcpp/support/callback_common.h
index 49eaa56172a..b4ba1e7baa5 100644
--- a/include/grpcpp/support/callback_common.h
+++ b/include/grpcpp/support/callback_common.h
@@ -19,10 +19,6 @@
 #ifndef GRPCPP_SUPPORT_CALLBACK_COMMON_H
 #define GRPCPP_SUPPORT_CALLBACK_COMMON_H
 
-#include <functional>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/impl/call.h>
@@ -32,6 +28,10 @@
 #include <grpcpp/support/global_callback_hook.h>
 #include <grpcpp/support/status.h>
 
+#include <functional>
+
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 namespace internal {
 
diff --git a/include/grpcpp/support/channel_arguments.h b/include/grpcpp/support/channel_arguments.h
index a149a6d72ba..c0858dbc623 100644
--- a/include/grpcpp/support/channel_arguments.h
+++ b/include/grpcpp/support/channel_arguments.h
@@ -19,14 +19,14 @@
 #ifndef GRPCPP_SUPPORT_CHANNEL_ARGUMENTS_H
 #define GRPCPP_SUPPORT_CHANNEL_ARGUMENTS_H
 
-#include <list>
-#include <vector>
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/support/config.h>
 
+#include <list>
+#include <vector>
+
 namespace grpc {
 class ChannelCredentials;
 namespace testing {
diff --git a/include/grpcpp/support/client_callback.h b/include/grpcpp/support/client_callback.h
index 82a404e2c87..88de62b6d9a 100644
--- a/include/grpcpp/support/client_callback.h
+++ b/include/grpcpp/support/client_callback.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SUPPORT_CLIENT_CALLBACK_H
 #define GRPCPP_SUPPORT_CLIENT_CALLBACK_H
 
-#include <atomic>
-#include <functional>
-
-#include "absl/log/absl_check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/call.h>
 #include <grpcpp/impl/call.h>
@@ -33,6 +28,11 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 
+#include <atomic>
+#include <functional>
+
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 class Channel;
 class ClientContext;
diff --git a/include/grpcpp/support/client_interceptor.h b/include/grpcpp/support/client_interceptor.h
index fbf554437bf..b00101f9b5c 100644
--- a/include/grpcpp/support/client_interceptor.h
+++ b/include/grpcpp/support/client_interceptor.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SUPPORT_CLIENT_INTERCEPTOR_H
 #define GRPCPP_SUPPORT_CLIENT_INTERCEPTOR_H
 
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/interceptor.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <memory>
 #include <vector>
 
 #include "absl/log/absl_check.h"
 
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc {
 
 class Channel;
diff --git a/include/grpcpp/support/interceptor.h b/include/grpcpp/support/interceptor.h
index 1e4d66610f6..04a4b34c4e2 100644
--- a/include/grpcpp/support/interceptor.h
+++ b/include/grpcpp/support/interceptor.h
@@ -19,16 +19,16 @@
 #ifndef GRPCPP_SUPPORT_INTERCEPTOR_H
 #define GRPCPP_SUPPORT_INTERCEPTOR_H
 
-#include <map>
-#include <memory>
-#include <string>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/impl/metadata_map.h>
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+#include <memory>
+#include <string>
+
 namespace grpc {
 
 class ChannelInterface;
diff --git a/include/grpcpp/support/method_handler.h b/include/grpcpp/support/method_handler.h
index 081401b187b..a61843bdb86 100644
--- a/include/grpcpp/support/method_handler.h
+++ b/include/grpcpp/support/method_handler.h
@@ -19,13 +19,13 @@
 #ifndef GRPCPP_SUPPORT_METHOD_HANDLER_H
 #define GRPCPP_SUPPORT_METHOD_HANDLER_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpcpp/impl/rpc_service_method.h>
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/sync_stream.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/support/proto_buffer_reader.h b/include/grpcpp/support/proto_buffer_reader.h
index 7bdf8d13d72..5f5be2cd0d9 100644
--- a/include/grpcpp/support/proto_buffer_reader.h
+++ b/include/grpcpp/support/proto_buffer_reader.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SUPPORT_PROTO_BUFFER_READER_H
 #define GRPCPP_SUPPORT_PROTO_BUFFER_READER_H
 
-#include <type_traits>
-
-#include "absl/log/absl_check.h"
-#include "absl/strings/cord.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/impl/grpc_types.h>
@@ -33,6 +28,11 @@
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/status.h>
 
+#include <type_traits>
+
+#include "absl/log/absl_check.h"
+#include "absl/strings/cord.h"
+
 /// This header provides an object that reads bytes directly from a
 /// grpc::ByteBuffer, via the ZeroCopyInputStream interface
 
diff --git a/include/grpcpp/support/proto_buffer_writer.h b/include/grpcpp/support/proto_buffer_writer.h
index 1417a619911..225c8555fb9 100644
--- a/include/grpcpp/support/proto_buffer_writer.h
+++ b/include/grpcpp/support/proto_buffer_writer.h
@@ -19,11 +19,6 @@
 #ifndef GRPCPP_SUPPORT_PROTO_BUFFER_WRITER_H
 #define GRPCPP_SUPPORT_PROTO_BUFFER_WRITER_H
 
-#include <type_traits>
-
-#include "absl/log/absl_check.h"
-#include "absl/strings/cord.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
@@ -33,6 +28,11 @@
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/status.h>
 
+#include <type_traits>
+
+#include "absl/log/absl_check.h"
+#include "absl/strings/cord.h"
+
 /// This header provides an object that writes bytes directly into a
 /// grpc::ByteBuffer, via the ZeroCopyOutputStream interface
 
diff --git a/include/grpcpp/support/server_callback.h b/include/grpcpp/support/server_callback.h
index e5fd910701a..378e88006bf 100644
--- a/include/grpcpp/support/server_callback.h
+++ b/include/grpcpp/support/server_callback.h
@@ -19,12 +19,6 @@
 #ifndef GRPCPP_SUPPORT_SERVER_CALLBACK_H
 #define GRPCPP_SUPPORT_SERVER_CALLBACK_H
 
-#include <atomic>
-#include <functional>
-#include <type_traits>
-
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/impl/call.h>
 #include <grpcpp/impl/call.h>
 #include <grpcpp/impl/call_op_set.h>
@@ -34,6 +28,12 @@
 #include <grpcpp/support/message_allocator.h>
 #include <grpcpp/support/status.h>
 
+#include <atomic>
+#include <functional>
+#include <type_traits>
+
+#include "absl/functional/any_invocable.h"
+
 namespace grpc {
 
 // Declare base class of all reactors as internal
diff --git a/include/grpcpp/support/server_interceptor.h b/include/grpcpp/support/server_interceptor.h
index de875a347f1..d705e740334 100644
--- a/include/grpcpp/support/server_interceptor.h
+++ b/include/grpcpp/support/server_interceptor.h
@@ -19,15 +19,15 @@
 #ifndef GRPCPP_SUPPORT_SERVER_INTERCEPTOR_H
 #define GRPCPP_SUPPORT_SERVER_INTERCEPTOR_H
 
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/support/interceptor.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <atomic>
 #include <vector>
 
 #include "absl/log/absl_check.h"
 
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/string_ref.h>
-
 namespace grpc {
 class ServerContextBase;
 namespace internal {
diff --git a/include/grpcpp/support/string_ref.h b/include/grpcpp/support/string_ref.h
index 380ceee2ffb..deb96b90d9f 100644
--- a/include/grpcpp/support/string_ref.h
+++ b/include/grpcpp/support/string_ref.h
@@ -19,6 +19,7 @@
 #ifndef GRPCPP_SUPPORT_STRING_REF_H
 #define GRPCPP_SUPPORT_STRING_REF_H
 
+#include <grpcpp/support/config.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include <iostream>
 #include <iterator>
 
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 
 /// This class is a non owning reference to a string.
diff --git a/include/grpcpp/support/sync_stream.h b/include/grpcpp/support/sync_stream.h
index 7479adb25c1..cacf605a979 100644
--- a/include/grpcpp/support/sync_stream.h
+++ b/include/grpcpp/support/sync_stream.h
@@ -19,8 +19,6 @@
 #ifndef GRPCPP_SUPPORT_SYNC_STREAM_H
 #define GRPCPP_SUPPORT_SYNC_STREAM_H
 
-#include "absl/log/absl_check.h"
-
 #include <grpcpp/client_context.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/call.h>
@@ -29,6 +27,8 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include "absl/log/absl_check.h"
+
 namespace grpc {
 
 namespace internal {
diff --git a/include/grpcpp/support/time.h b/include/grpcpp/support/time.h
index 5397eb6ba24..41edfb5fd90 100644
--- a/include/grpcpp/support/time.h
+++ b/include/grpcpp/support/time.h
@@ -19,11 +19,11 @@
 #ifndef GRPCPP_SUPPORT_TIME_H
 #define GRPCPP_SUPPORT_TIME_H
 
-#include <chrono>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpcpp/support/config.h>
 
+#include <chrono>
+
 namespace grpc {
 
 /// If you are trying to use CompletionQueue::AsyncNext with a time class that
diff --git a/include/grpcpp/test/client_context_test_peer.h b/include/grpcpp/test/client_context_test_peer.h
index 9cb1f683787..632575b6314 100644
--- a/include/grpcpp/test/client_context_test_peer.h
+++ b/include/grpcpp/test/client_context_test_peer.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H
 #define GRPCPP_TEST_CLIENT_CONTEXT_TEST_PEER_H
 
-#include <map>
-
 #include <grpcpp/client_context.h>
 
+#include <map>
+
 namespace grpc {
 namespace testing {
 
diff --git a/include/grpcpp/test/mock_stream.h b/include/grpcpp/test/mock_stream.h
index 7c39358d949..6ab61ff0dba 100644
--- a/include/grpcpp/test/mock_stream.h
+++ b/include/grpcpp/test/mock_stream.h
@@ -19,14 +19,12 @@
 #ifndef GRPCPP_TEST_MOCK_STREAM_H
 #define GRPCPP_TEST_MOCK_STREAM_H
 
-#include <stdint.h>
-
 #include <gmock/gmock.h>
-
 #include <grpcpp/impl/call.h>
 #include <grpcpp/support/async_stream.h>
 #include <grpcpp/support/async_unary_call.h>
 #include <grpcpp/support/sync_stream.h>
+#include <stdint.h>
 
 namespace grpc {
 namespace testing {
diff --git a/include/grpcpp/test/server_context_test_spouse.h b/include/grpcpp/test/server_context_test_spouse.h
index 88dc7205588..c68f1a94cc7 100644
--- a/include/grpcpp/test/server_context_test_spouse.h
+++ b/include/grpcpp/test/server_context_test_spouse.h
@@ -19,10 +19,10 @@
 #ifndef GRPCPP_TEST_SERVER_CONTEXT_TEST_SPOUSE_H
 #define GRPCPP_TEST_SERVER_CONTEXT_TEST_SPOUSE_H
 
-#include <map>
-
 #include <grpcpp/server_context.h>
 
+#include <map>
+
 namespace grpc {
 namespace testing {
 
diff --git a/src/.clang-format b/src/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/compiler/.clang-format b/src/compiler/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/compiler/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 2a2a9ebc0d2..530dfddedf5 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -18,12 +18,12 @@
 
 #include "src/compiler/objective_c_generator.h"
 
+#include <google/protobuf/compiler/objectivec/names.h>
+
 #include <map>
 #include <set>
 #include <sstream>
 
-#include <google/protobuf/compiler/objectivec/names.h>
-
 #include "src/compiler/config.h"
 #include "src/compiler/objective_c_generator_helpers.h"
 
diff --git a/src/compiler/objective_c_generator_helpers.h b/src/compiler/objective_c_generator_helpers.h
index 8490ecf6a0c..1337863f9dd 100644
--- a/src/compiler/objective_c_generator_helpers.h
+++ b/src/compiler/objective_c_generator_helpers.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H
 #define GRPC_INTERNAL_COMPILER_OBJECTIVE_C_GENERATOR_HELPERS_H
 
-#include <map>
-
 #include <google/protobuf/compiler/objectivec/names.h>
 
+#include <map>
+
 #include "src/compiler/config.h"
 #include "src/compiler/generator_helpers.h"
 
diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc
index 4b0f2964212..1d886fcf1d5 100644
--- a/src/compiler/objective_c_plugin.cc
+++ b/src/compiler/objective_c_plugin.cc
@@ -18,10 +18,10 @@
 
 // Generates Objective C gRPC service interface out of Protobuf IDL.
 
-#include <memory>
-
 #include <google/protobuf/compiler/objectivec/names.h>
 
+#include <memory>
+
 #include "src/compiler/config.h"
 #include "src/compiler/objective_c_generator.h"
 #include "src/compiler/objective_c_generator_helpers.h"
diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc
index 7ef2891c488..338b5b602cf 100644
--- a/src/compiler/php_generator.cc
+++ b/src/compiler/php_generator.cc
@@ -16,10 +16,10 @@
  *
  */
 
-#include <map>
-
 #include <google/protobuf/compiler/php/php_generator.h>
 
+#include <map>
+
 #include "src/compiler/config.h"
 #include "src/compiler/generator_helpers.h"
 #include "src/compiler/php_generator_helpers.h"
diff --git a/src/core/.clang-format b/src/core/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/channelz/channel_trace.cc b/src/core/channelz/channel_trace.cc
index ee1de5e87c5..78d7e049009 100644
--- a/src/core/channelz/channel_trace.cc
+++ b/src/core/channelz/channel_trace.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/channelz/channel_trace.h"
 
-#include <memory>
-#include <utility>
-
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/strings/str_cat.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/channelz/channel_trace.h b/src/core/channelz/channel_trace.h
index 82ac733e4c7..c9e42094379 100644
--- a/src/core/channelz/channel_trace.h
+++ b/src/core/channelz/channel_trace.h
@@ -19,15 +19,13 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNEL_TRACE_H
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
+#include <stdint.h>
 
+#include "absl/base/thread_annotations.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/channelz/channelz.cc b/src/core/channelz/channelz.cc
index ef27e51ffbf..1a8aa222a72 100644
--- a/src/core/channelz/channelz.cc
+++ b/src/core/channelz/channelz.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/channelz/channelz.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
@@ -27,11 +31,6 @@
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz_registry.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/src/core/channelz/channelz.h b/src/core/channelz/channelz.h
index 6938ec99437..316e96fba74 100644
--- a/src/core/channelz/channelz.h
+++ b/src/core/channelz/channelz.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -31,12 +35,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/per_cpu.h"
diff --git a/src/core/channelz/channelz_registry.cc b/src/core/channelz/channelz_registry.cc
index 4393675c831..6db28fa7514 100644
--- a/src/core/channelz/channelz_registry.cc
+++ b/src/core/channelz/channelz_registry.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/channelz/channelz_registry.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -26,12 +31,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/channelz/channelz_registry.h b/src/core/channelz/channelz_registry.h
index f849ac1ac84..eeb6a47d788 100644
--- a/src/core/channelz/channelz_registry.h
+++ b/src/core/channelz/channelz_registry.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H
 #define GRPC_SRC_CORE_CHANNELZ_CHANNELZ_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <map>
 #include <string>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/client_channel/.clang-format b/src/core/client_channel/.clang-format
deleted file mode 100644
index 64387e9e515..00000000000
--- a/src/core/client_channel/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/client_channel/backup_poller.cc b/src/core/client_channel/backup_poller.cc
index 37914688a7e..43b485dc7ef 100644
--- a/src/core/client_channel/backup_poller.cc
+++ b/src/core/client_channel/backup_poller.cc
@@ -16,18 +16,15 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/backup_poller.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/client_channel/client_channel.cc b/src/core/client_channel/client_channel.cc
index 0d12c4b292a..315befd72ef 100644
--- a/src/core/client_channel/client_channel.cc
+++ b/src/core/client_channel/client_channel.cc
@@ -12,10 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -38,16 +45,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/metrics.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/client_channel/config_selector.h"
diff --git a/src/core/client_channel/client_channel.h b/src/core/client_channel/client_channel.h
index a7f7d75c705..662274446ad 100644
--- a/src/core/client_channel/client_channel.h
+++ b/src/core/client_channel/client_channel.h
@@ -22,7 +22,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/client_channel/subchannel.h"
diff --git a/src/core/client_channel/client_channel_factory.cc b/src/core/client_channel/client_channel_factory.cc
index 39b5c20e97e..615950a599e 100644
--- a/src/core/client_channel/client_channel_factory.cc
+++ b/src/core/client_channel/client_channel_factory.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_factory.h"
 
+#include <grpc/support/port_platform.h>
+
 // Channel arg key for client channel factory.
 #define GRPC_ARG_CLIENT_CHANNEL_FACTORY "grpc.client_channel_factory"
 
diff --git a/src/core/client_channel/client_channel_factory.h b/src/core/client_channel/client_channel_factory.h
index fee6cd9f628..9e8ca146e0e 100644
--- a/src/core/client_channel/client_channel_factory.h
+++ b/src/core/client_channel/client_channel_factory.h
@@ -20,7 +20,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/src/core/client_channel/client_channel_filter.cc b/src/core/client_channel/client_channel_filter.cc
index 82caeb27ffc..6b87eb436c7 100644
--- a/src/core/client_channel/client_channel_filter.cc
+++ b/src/core/client_channel/client_channel_filter.cc
@@ -14,10 +14,16 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -41,15 +47,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/client_channel/client_channel_internal.h"
diff --git a/src/core/client_channel/client_channel_filter.h b/src/core/client_channel/client_channel_filter.h
index 0ca401df455..c2318360fba 100644
--- a/src/core/client_channel/client_channel_filter.h
+++ b/src/core/client_channel/client_channel_filter.h
@@ -17,8 +17,9 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_FILTER_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <atomic>
@@ -33,10 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/config_selector.h"
diff --git a/src/core/client_channel/client_channel_internal.h b/src/core/client_channel/client_channel_internal.h
index 1806bf057c9..99e045c0047 100644
--- a/src/core/client_channel/client_channel_internal.h
+++ b/src/core/client_channel/client_channel_internal.h
@@ -23,7 +23,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/call_destination.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/client_channel/client_channel_plugin.cc b/src/core/client_channel/client_channel_plugin.cc
index ccec049b6eb..afb99741950 100644
--- a/src/core/client_channel/client_channel_plugin.cc
+++ b/src/core/client_channel/client_channel_plugin.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/client_channel/retry_service_config.h"
diff --git a/src/core/client_channel/client_channel_service_config.cc b/src/core/client_channel/client_channel_service_config.cc
index af08f54a956..07d34b12d44 100644
--- a/src/core/client_channel/client_channel_service_config.cc
+++ b/src/core/client_channel/client_channel_service_config.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_service_config.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <utility>
 
@@ -26,7 +26,6 @@
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
 #include "src/core/load_balancing/lb_policy_registry.h"
 
 // As per the retry design, we do not allow more than 5 retry attempts.
diff --git a/src/core/client_channel/client_channel_service_config.h b/src/core/client_channel/client_channel_service_config.h
index e985b8e92e0..6d33d11b170 100644
--- a/src/core/client_channel/client_channel_service_config.h
+++ b/src/core/client_channel/client_channel_service_config.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_CLIENT_CHANNEL_SERVICE_CONFIG_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
@@ -26,7 +25,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/client_channel/config_selector.h b/src/core/client_channel/config_selector.h
index 76572369fe4..2901ee471bd 100644
--- a/src/core/client_channel/config_selector.h
+++ b/src/core/client_channel/config_selector.h
@@ -17,8 +17,8 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_CONFIG_SELECTOR_H
 
+#include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
-
 #include <string.h>
 
 #include <utility>
@@ -27,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/core/client_channel/dynamic_filters.cc b/src/core/client_channel/dynamic_filters.cc
index c2825925fa4..93a3c49d957 100644
--- a/src/core/client_channel/dynamic_filters.cc
+++ b/src/core/client_channel/dynamic_filters.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/dynamic_filters.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <new>
@@ -26,7 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
diff --git a/src/core/client_channel/dynamic_filters.h b/src/core/client_channel/dynamic_filters.h
index 30a5354f935..505ca293ead 100644
--- a/src/core/client_channel/dynamic_filters.h
+++ b/src/core/client_channel/dynamic_filters.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_DYNAMIC_FILTERS_H
 
+#include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 
 #include <utility>
 #include <vector>
 
-#include <grpc/slice.h>
-
 #include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/client_channel/global_subchannel_pool.cc b/src/core/client_channel/global_subchannel_pool.cc
index 2f3ecf9faeb..5b6ffe85a22 100644
--- a/src/core/client_channel/global_subchannel_pool.cc
+++ b/src/core/client_channel/global_subchannel_pool.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/global_subchannel_pool.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "src/core/client_channel/subchannel.h"
diff --git a/src/core/client_channel/global_subchannel_pool.h b/src/core/client_channel/global_subchannel_pool.h
index 76ef31af385..79ea6672796 100644
--- a/src/core/client_channel/global_subchannel_pool.h
+++ b/src/core/client_channel/global_subchannel_pool.h
@@ -24,7 +24,6 @@
 #include <map>
 
 #include "absl/base/thread_annotations.h"
-
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/client_channel/lb_metadata.h b/src/core/client_channel/lb_metadata.h
index f1c5e7e429f..f41510120a5 100644
--- a/src/core/client_channel/lb_metadata.h
+++ b/src/core/client_channel/lb_metadata.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_LB_METADATA_H
 
+#include <grpc/event_engine/slice.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/slice.h>
-
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/load_balancing/lb_policy.h"
 
diff --git a/src/core/client_channel/load_balanced_call_destination.cc b/src/core/client_channel/load_balanced_call_destination.cc
index 5d7c0b3c66c..2415e367ccc 100644
--- a/src/core/client_channel/load_balanced_call_destination.cc
+++ b/src/core/client_channel/load_balanced_call_destination.cc
@@ -15,7 +15,6 @@
 #include "src/core/client_channel/load_balanced_call_destination.h"
 
 #include "absl/log/log.h"
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/lb_metadata.h"
diff --git a/src/core/client_channel/load_balanced_call_destination.h b/src/core/client_channel/load_balanced_call_destination.h
index 2adbdbe3dc3..904ff47e1ec 100644
--- a/src/core/client_channel/load_balanced_call_destination.h
+++ b/src/core/client_channel/load_balanced_call_destination.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_LOAD_BALANCED_CALL_DESTINATION_H
 
 #include "absl/functional/any_invocable.h"
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/transport/call_destination.h"
diff --git a/src/core/client_channel/local_subchannel_pool.cc b/src/core/client_channel/local_subchannel_pool.cc
index 878d3547b96..428db14bdf9 100644
--- a/src/core/client_channel/local_subchannel_pool.cc
+++ b/src/core/client_channel/local_subchannel_pool.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/local_subchannel_pool.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
-
 #include "src/core/client_channel/subchannel.h"
 
 namespace grpc_core {
diff --git a/src/core/client_channel/retry_filter.cc b/src/core/client_channel/retry_filter.cc
index 73de1a4ebe1..f4bf99d5c5c 100644
--- a/src/core/client_channel/retry_filter.cc
+++ b/src/core/client_channel/retry_filter.cc
@@ -14,18 +14,16 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_filter.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/retry_filter_legacy_call_data.h"
 #include "src/core/client_channel/retry_service_config.h"
diff --git a/src/core/client_channel/retry_filter.h b/src/core/client_channel/retry_filter.h
index 402fa047691..1ed87fbc989 100644
--- a/src/core/client_channel/retry_filter.h
+++ b/src/core/client_channel/retry_filter.h
@@ -17,8 +17,10 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
-
 #include <limits.h>
 #include <stddef.h>
 
@@ -26,11 +28,6 @@
 
 #include "absl/log/check.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/retry_service_config.h"
 #include "src/core/client_channel/retry_throttle.h"
diff --git a/src/core/client_channel/retry_filter_legacy_call_data.cc b/src/core/client_channel/retry_filter_legacy_call_data.cc
index dda37fd4c62..7e3abc4a5a8 100644
--- a/src/core/client_channel/retry_filter_legacy_call_data.cc
+++ b/src/core/client_channel/retry_filter_legacy_call_data.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_filter_legacy_call_data.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <memory>
@@ -25,7 +24,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/retry_service_config.h"
 #include "src/core/client_channel/retry_throttle.h"
diff --git a/src/core/client_channel/retry_filter_legacy_call_data.h b/src/core/client_channel/retry_filter_legacy_call_data.h
index a4336072f1b..b121a8735bc 100644
--- a/src/core/client_channel/retry_filter_legacy_call_data.h
+++ b/src/core/client_channel/retry_filter_legacy_call_data.h
@@ -15,8 +15,10 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_FILTER_LEGACY_CALL_DATA_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -25,11 +27,6 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/client_channel/retry_filter.h"
 #include "src/core/client_channel/retry_service_config.h"
diff --git a/src/core/client_channel/retry_service_config.cc b/src/core/client_channel/retry_service_config.cc
index e0ee89ce140..01e4c867ea9 100644
--- a/src/core/client_channel/retry_service_config.cc
+++ b/src/core/client_channel/retry_service_config.cc
@@ -14,10 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_service_config.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 #include <utility>
@@ -27,11 +30,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/client_channel/retry_service_config.h b/src/core/client_channel/retry_service_config.h
index 237e3b93bcc..91c6fe52dc9 100644
--- a/src/core/client_channel/retry_service_config.h
+++ b/src/core/client_channel/retry_service_config.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,7 +25,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/client_channel/retry_throttle.cc b/src/core/client_channel/retry_throttle.cc
index c9671832309..a631a8c47dd 100644
--- a/src/core/client_channel/retry_throttle.cc
+++ b/src/core/client_channel/retry_throttle.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/retry_throttle.h"
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 #include <utility>
 
-#include <grpc/support/atm.h>
-
 namespace grpc_core {
 namespace internal {
 
diff --git a/src/core/client_channel/retry_throttle.h b/src/core/client_channel/retry_throttle.h
index 3cb32604277..fd01471d673 100644
--- a/src/core/client_channel/retry_throttle.h
+++ b/src/core/client_channel/retry_throttle.h
@@ -19,17 +19,14 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_RETRY_THROTTLE_H
 
+#include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <map>
 #include <string>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/atm.h>
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/client_channel/subchannel.cc b/src/core/client_channel/subchannel.cc
index 26f76b77709..56918f0f294 100644
--- a/src/core/client_channel/subchannel.cc
+++ b/src/core/client_channel/subchannel.cc
@@ -14,10 +14,12 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -33,11 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_internal.h"
diff --git a/src/core/client_channel/subchannel.h b/src/core/client_channel/subchannel.h
index 06a414363b1..41928e95300 100644
--- a/src/core/client_channel/subchannel.h
+++ b/src/core/client_channel/subchannel.h
@@ -17,8 +17,9 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <functional>
@@ -27,10 +28,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/src/core/client_channel/subchannel_pool_interface.cc b/src/core/client_channel/subchannel_pool_interface.cc
index 7b083a8b47a..bc55e478008 100644
--- a/src/core/client_channel/subchannel_pool_interface.cc
+++ b/src/core/client_channel/subchannel_pool_interface.cc
@@ -16,16 +16,14 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel_pool_interface.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 
diff --git a/src/core/client_channel/subchannel_pool_interface.h b/src/core/client_channel/subchannel_pool_interface.h
index d7cab8f1e99..ca385d1e591 100644
--- a/src/core/client_channel/subchannel_pool_interface.h
+++ b/src/core/client_channel/subchannel_pool_interface.h
@@ -24,7 +24,6 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/src/core/client_channel/subchannel_stream_client.cc b/src/core/client_channel/subchannel_stream_client.cc
index a01165e3d11..205daac3d96 100644
--- a/src/core/client_channel/subchannel_stream_client.cc
+++ b/src/core/client_channel/subchannel_stream_client.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel_stream_client.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -25,9 +25,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/src/core/client_channel/subchannel_stream_client.h b/src/core/client_channel/subchannel_stream_client.h
index f50314e0ace..0f530c17f36 100644
--- a/src/core/client_channel/subchannel_stream_client.h
+++ b/src/core/client_channel/subchannel_stream_client.h
@@ -17,6 +17,10 @@
 #ifndef GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H
 #define GRPC_SRC_CORE_CLIENT_CHANNEL_SUBCHANNEL_STREAM_CLIENT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
 #include <atomic>
@@ -26,12 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/ext/.clang-format b/src/core/ext/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/filters/.clang-format b/src/core/ext/filters/.clang-format
deleted file mode 100644
index 64387e9e515..00000000000
--- a/src/core/ext/filters/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
index da589a303b7..8d5e559e7a5 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/backend_metrics/backend_metric_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -26,12 +26,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
@@ -44,6 +38,9 @@
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/util/latent_see.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
+#include "xds/data/orca/v3/orca_load_report.upb.h"
 
 namespace grpc_core {
 
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.h b/src/core/ext/filters/backend_metrics/backend_metric_filter.h
index 02ee8611dce..c2d630a155a 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.h
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.h
@@ -21,7 +21,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
 #include "src/core/ext/filters/backend_metrics/backend_metric_provider.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/census/grpc_context.cc b/src/core/ext/filters/census/grpc_context.cc
index 77965df7ecd..42d72df6523 100644
--- a/src/core/ext/filters/census/grpc_context.cc
+++ b/src/core/ext/filters/census/grpc_context.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/census.h>
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/ext/filters/channel_idle/idle_filter_state.cc b/src/core/ext/filters/channel_idle/idle_filter_state.cc
index 72b5448a1e5..2fbc8365067 100644
--- a/src/core/ext/filters/channel_idle/idle_filter_state.cc
+++ b/src/core/ext/filters/channel_idle/idle_filter_state.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/channel_idle/idle_filter_state.h"
 
 #include <assert.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 
diff --git a/src/core/ext/filters/channel_idle/idle_filter_state.h b/src/core/ext/filters/channel_idle/idle_filter_state.h
index f921e082fcd..772d4a0b6c3 100644
--- a/src/core/ext/filters/channel_idle/idle_filter_state.h
+++ b/src/core/ext/filters/channel_idle/idle_filter_state.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_IDLE_FILTER_STATE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <atomic>
diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
index bc4e834a10d..968386bec8a 100644
--- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
+++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
@@ -15,10 +15,11 @@
 // TODO(ctiller): Add a unit test suite for these filters once it's practical to
 // mock transport operations.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <utility>
 
@@ -27,9 +28,6 @@
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
index b4b61f10bb3..b903b41f766 100644
--- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
+++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.h
@@ -15,15 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_LEGACY_CHANNEL_IDLE_FILTER_H
 #define GRPC_SRC_CORE_EXT_FILTERS_CHANNEL_IDLE_LEGACY_CHANNEL_IDLE_FILTER_H
 
+#include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
 
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/impl/connectivity_state.h>
-
 #include "src/core/ext/filters/channel_idle/idle_filter_state.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc
index e0e4d3e031b..72429fea9d6 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc
+++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -35,9 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/status.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h
index 40b839c1033..c7e04a470fd 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_filter.h
+++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
@@ -26,7 +25,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
index 9e12ce0b093..6ecb24f856b 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
+++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 
diff --git a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
index 0016c552c8e..f2c4769ccc6 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
+++ b/src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h
@@ -17,8 +17,8 @@
 #ifndef GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H
 #define GRPC_SRC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H
 
+#include <grpc/status.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -28,9 +28,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
index e301ed62154..61a6a84a64e 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.cc
@@ -22,7 +22,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
index a3136ebd460..66f8d13d4da 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h
@@ -23,7 +23,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 #include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc
index 4af33e528f7..2fb9fd2f55c 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h
index 2c64a694485..36637d580b3 100644
--- a/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h
+++ b/src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h
@@ -25,7 +25,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/ext/filters/http/client/http_client_filter.cc b/src/core/ext/filters/http/client/http_client_filter.cc
index f46b3641b61..cd91e931e56 100644
--- a/src/core/ext/filters/http/client/http_client_filter.cc
+++ b/src/core/ext/filters/http/client/http_client_filter.cc
@@ -15,10 +15,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <functional>
 #include <memory>
@@ -33,11 +36,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
diff --git a/src/core/ext/filters/http/client/http_client_filter.h b/src/core/ext/filters/http/client/http_client_filter.h
index 0b319cec303..05f6c14fe90 100644
--- a/src/core/ext/filters/http/client/http_client_filter.h
+++ b/src/core/ext/filters/http/client/http_client_filter.h
@@ -21,7 +21,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc
index b43e6a65b2b..924a54d469f 100644
--- a/src/core/ext/filters/http/client_authority_filter.cc
+++ b/src/core/ext/filters/http/client_authority_filter.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/client_authority_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/transport/auth_filters.h"
diff --git a/src/core/ext/filters/http/client_authority_filter.h b/src/core/ext/filters/http/client_authority_filter.h
index c3b817527c1..0137c21bc62 100644
--- a/src/core/ext/filters/http/client_authority_filter.h
+++ b/src/core/ext/filters/http/client_authority_filter.h
@@ -24,7 +24,6 @@
 #include <utility>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc
index b662737ebae..b791e454b33 100644
--- a/src/core/ext/filters/http/http_filters_plugin.cc
+++ b/src/core/ext/filters/http/http_filters_plugin.cc
@@ -19,7 +19,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/match.h"
-
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/ext/filters/http/message_compress/compression_filter.h"
 #include "src/core/ext/filters/http/server/http_server_filter.h"
diff --git a/src/core/ext/filters/http/message_compress/compression_filter.cc b/src/core/ext/filters/http/message_compress/compression_filter.cc
index 85a67690206..fe7123db78f 100644
--- a/src/core/ext/filters/http/message_compress/compression_filter.cc
+++ b/src/core/ext/filters/http/message_compress/compression_filter.cc
@@ -12,10 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/message_compress/compression_filter.h"
 
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -27,12 +30,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/compression_types.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/ext/filters/http/message_compress/compression_filter.h b/src/core/ext/filters/http/message_compress/compression_filter.h
index ae3a9ee317e..fbd28d309f7 100644
--- a/src/core/ext/filters/http/message_compress/compression_filter.h
+++ b/src/core/ext/filters/http/message_compress/compression_filter.h
@@ -19,17 +19,14 @@
 #ifndef GRPC_SRC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H
 #define GRPC_SRC_CORE_EXT_FILTERS_HTTP_MESSAGE_COMPRESS_COMPRESSION_FILTER_H
 
+#include <grpc/impl/compression_types.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/compression_types.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/http/server/http_server_filter.cc b/src/core/ext/filters/http/server/http_server_filter.cc
index 92e541775e5..35c73ba7be7 100644
--- a/src/core/ext/filters/http/server/http_server_filter.cc
+++ b/src/core/ext/filters/http/server/http_server_filter.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
@@ -28,10 +30,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/ext/filters/http/server/http_server_filter.h b/src/core/ext/filters/http/server/http_server_filter.h
index 8f933865d7d..c84e619bfb4 100644
--- a/src/core/ext/filters/http/server/http_server_filter.h
+++ b/src/core/ext/filters/http/server/http_server_filter.h
@@ -22,7 +22,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/load_reporting/registered_opencensus_objects.h b/src/core/ext/filters/load_reporting/registered_opencensus_objects.h
index cb17a04109d..0df3ce181fc 100644
--- a/src/core/ext/filters/load_reporting/registered_opencensus_objects.h
+++ b/src/core/ext/filters/load_reporting/registered_opencensus_objects.h
@@ -23,7 +23,6 @@
 
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
-
 #include "src/cpp/server/load_reporter/constants.h"
 
 namespace grpc {
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
index 48cb742e505..a7d9eeccdd9 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
@@ -16,10 +16,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h"
 
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -38,12 +41,6 @@
 #include "absl/types/optional.h"
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/call_finalization.h"
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
index 41f66ec948d..d5a5eb96bf5 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
@@ -20,13 +20,11 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_LOAD_REPORTING_SERVER_LOAD_REPORTING_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <string>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/arena_promise.h"
diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc
index cf12d8bb6ac..b8563872eb4 100644
--- a/src/core/ext/filters/logging/logging_filter.cc
+++ b/src/core/ext/filters/logging/logging_filter.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -42,11 +44,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/ext/filters/logging/logging_filter.h b/src/core/ext/filters/logging/logging_filter.h
index 5d8b77752cd..9acc80e99c2 100644
--- a/src/core/ext/filters/logging/logging_filter.h
+++ b/src/core/ext/filters/logging/logging_filter.h
@@ -25,7 +25,6 @@
 #include <utility>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/logging/logging_sink.h b/src/core/ext/filters/logging/logging_sink.h
index 71720799e4d..8b7914e0110 100644
--- a/src/core/ext/filters/logging/logging_sink.h
+++ b/src/core/ext/filters/logging/logging_sink.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_LOGGING_LOGGING_SINK_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <map>
@@ -29,7 +28,6 @@
 #include "absl/numeric/int128.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc
index 01cc9a3a9d7..813cd04dbf3 100644
--- a/src/core/ext/filters/message_size/message_size_filter.cc
+++ b/src/core/ext/filters/message_size/message_size_filter.cc
@@ -14,10 +14,11 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -25,10 +26,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/message_size/message_size_filter.h b/src/core/ext/filters/message_size/message_size_filter.h
index 2bc36cfde31..ff6dc5837df 100644
--- a/src/core/ext/filters/message_size/message_size_filter.h
+++ b/src/core/ext/filters/message_size/message_size_filter.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_MESSAGE_SIZE_MESSAGE_SIZE_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,7 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc
index c7a8d139b17..0385b865c7c 100644
--- a/src/core/ext/filters/rbac/rbac_filter.cc
+++ b/src/core/ext/filters/rbac/rbac_filter.cc
@@ -14,18 +14,16 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/rbac/rbac_filter.h"
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/grpc_security.h>
-
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/ext/filters/rbac/rbac_filter.h b/src/core/ext/filters/rbac/rbac_filter.h
index f41e8490ccf..16489f47f02 100644
--- a/src/core/ext/filters/rbac/rbac_filter.h
+++ b/src/core/ext/filters/rbac/rbac_filter.h
@@ -18,11 +18,9 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc
index 56195fe4625..5c1fce9748c 100644
--- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc
+++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc
@@ -14,10 +14,11 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <map>
 #include <memory>
@@ -27,9 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_audit_logging.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.h b/src/core/ext/filters/rbac/rbac_service_config_parser.h
index f9a4c29c34e..0bd3bc465e6 100644
--- a/src/core/ext/filters/rbac/rbac_service_config_parser.h
+++ b/src/core/ext/filters/rbac/rbac_service_config_parser.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_RBAC_RBAC_SERVICE_CONFIG_PARSER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,7 +26,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
index 3852c7155bb..22b3177c08f 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -36,7 +35,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h
index b7bde679c17..ce4e1dc801e 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.h
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h
@@ -18,14 +18,12 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_FILTER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <utility>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
index 3be9785ac7c..1dc24ac99ce 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
+++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <vector>
 
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
index edf6f55a79d..59ee3bd7069 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
+++ b/src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_EXT_FILTERS_STATEFUL_SESSION_STATEFUL_SESSION_SERVICE_CONFIG_PARSER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <memory>
@@ -27,7 +26,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/ext/transport/.clang-format b/src/core/ext/transport/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/transport/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/transport/binder/.clang-format b/src/core/ext/transport/binder/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/transport/binder/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/transport/binder/client/binder_connector.cc b/src/core/ext/transport/binder/client/binder_connector.cc
index 725c5ad8a39..1317219a173 100644
--- a/src/core/ext/transport/binder/client/binder_connector.cc
+++ b/src/core/ext/transport/binder/client/binder_connector.cc
@@ -30,14 +30,13 @@
 #endif  // GPR_WINDOWS
 #endif
 
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <functional>
 #include <map>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
diff --git a/src/core/ext/transport/binder/client/binder_connector.h b/src/core/ext/transport/binder/client/binder_connector.h
index e054e3555c5..5ce6d86e583 100644
--- a/src/core/ext/transport/binder/client/binder_connector.h
+++ b/src/core/ext/transport/binder/client/binder_connector.h
@@ -15,17 +15,16 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H
 
-#include <memory>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-#include "absl/strings/strip.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
 
diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc
index 6ccf25f5b9b..483d488afaa 100644
--- a/src/core/ext/transport/binder/client/channel_create.cc
+++ b/src/core/ext/transport/binder/client/channel_create.cc
@@ -33,16 +33,15 @@
 
 #ifdef GPR_SUPPORT_BINDER_TRANSPORT
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/substitute.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/ext/transport/binder/client/channel_create_impl.h"
 #include "src/core/ext/transport/binder/client/connection_id_generator.h"
diff --git a/src/core/ext/transport/binder/client/channel_create_impl.cc b/src/core/ext/transport/binder/client/channel_create_impl.cc
index cf3a0caab69..1234c7c80fc 100644
--- a/src/core/ext/transport/binder/client/channel_create_impl.cc
+++ b/src/core/ext/transport/binder/client/channel_create_impl.cc
@@ -22,7 +22,6 @@
 #include <utility>
 
 #include "absl/log/check.h"
-
 #include "src/core/ext/transport/binder/client/binder_connector.h"
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
diff --git a/src/core/ext/transport/binder/client/connection_id_generator.h b/src/core/ext/transport/binder/client/connection_id_generator.h
index fbe945cfb74..6e2b98d4ea1 100644
--- a/src/core/ext/transport/binder/client/connection_id_generator.h
+++ b/src/core/ext/transport/binder/client/connection_id_generator.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
index 012d7f03063..b64436acb5a 100644
--- a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifndef GRPC_NO_BINDER
 
 #include "src/core/ext/transport/binder/client/jni_utils.h"
diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.h b/src/core/ext/transport/binder/client/endpoint_binder_pool.h
index 4f9ac233219..997c36e76a6 100644
--- a/src/core/ext/transport/binder/client/endpoint_binder_pool.h
+++ b/src/core/ext/transport/binder/client/endpoint_binder_pool.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 
 #include "absl/container/flat_hash_map.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/ext/transport/binder/client/jni_utils.cc b/src/core/ext/transport/binder/client/jni_utils.cc
index 8fc4f629c3c..3f13e269b0c 100644
--- a/src/core/ext/transport/binder/client/jni_utils.cc
+++ b/src/core/ext/transport/binder/client/jni_utils.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/ext/transport/binder/client/jni_utils.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifndef GRPC_NO_BINDER
 
 #include "src/core/util/crash.h"
diff --git a/src/core/ext/transport/binder/client/jni_utils.h b/src/core/ext/transport/binder/client/jni_utils.h
index 1c809b127c8..c83949d3bf0 100644
--- a/src/core/ext/transport/binder/client/jni_utils.h
+++ b/src/core/ext/transport/binder/client/jni_utils.h
@@ -17,6 +17,7 @@
 
 #if defined(ANDROID) || defined(__ANDROID__)
 
+#include <grpc/support/port_platform.h>
 #include <jni.h>
 
 #include <functional>
@@ -24,8 +25,6 @@
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_binder {
 
 // Finds NativeConnectionHelper Java class and caches it. This is useful because
diff --git a/src/core/ext/transport/binder/client/security_policy_setting.cc b/src/core/ext/transport/binder/client/security_policy_setting.cc
index 318b434e6fa..c08a83324c3 100644
--- a/src/core/ext/transport/binder/client/security_policy_setting.cc
+++ b/src/core/ext/transport/binder/client/security_policy_setting.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 #ifndef GRPC_NO_BINDER
 
 #include "src/core/ext/transport/binder/client/security_policy_setting.h"
diff --git a/src/core/ext/transport/binder/client/security_policy_setting.h b/src/core/ext/transport/binder/client/security_policy_setting.h
index 46fb000246a..cd386693408 100644
--- a/src/core/ext/transport/binder/client/security_policy_setting.h
+++ b/src/core/ext/transport/binder/client/security_policy_setting.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H
 
-#include "absl/container/flat_hash_map.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/security/binder_security_policy.h>
 
+#include "absl/container/flat_hash_map.h"
+#include "absl/strings/string_view.h"
 #include "src/core/util/sync.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
index 4fe4ee4d159..8126d4c6db7 100644
--- a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+++ b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
@@ -25,7 +25,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/ext/transport/binder/client/jni_utils.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/ext/transport/binder/server/binder_server.cc b/src/core/ext/transport/binder/server/binder_server.cc
index 3d84b95a8d5..65d70c2fdb7 100644
--- a/src/core/ext/transport/binder/server/binder_server.cc
+++ b/src/core/ext/transport/binder/server/binder_server.cc
@@ -18,6 +18,8 @@
 
 #ifndef GRPC_NO_BINDER
 
+#include <grpc/grpc.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -25,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/utils/ndk_binder.h"
 #include "src/core/ext/transport/binder/wire_format/binder_android.h"
diff --git a/src/core/ext/transport/binder/server/binder_server.h b/src/core/ext/transport/binder/server/binder_server.h
index 34f25090c59..889a2555438 100644
--- a/src/core/ext/transport/binder/server/binder_server.h
+++ b/src/core/ext/transport/binder/server/binder_server.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <string>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/ext/transport/binder/server/binder_server_credentials.cc b/src/core/ext/transport/binder/server/binder_server_credentials.cc
index 0d8f3dd63af..aea85fd82a6 100644
--- a/src/core/ext/transport/binder/server/binder_server_credentials.cc
+++ b/src/core/ext/transport/binder/server/binder_server_credentials.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 #ifndef GRPC_NO_BINDER
 
 #include <grpcpp/security/binder_security_policy.h>
diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc
index 06ed2da8798..aa0990f9ba2 100644
--- a/src/core/ext/transport/binder/transport/binder_transport.cc
+++ b/src/core/ext/transport/binder/transport/binder_transport.cc
@@ -28,7 +28,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/substitute.h"
-
 #include "src/core/ext/transport/binder/transport/binder_stream.h"
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"
diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h
index 108926f25df..1e5446c3fc1 100644
--- a/src/core/ext/transport/binder/transport/binder_transport.h
+++ b/src/core/ext/transport/binder/transport/binder_transport.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <atomic>
 #include <memory>
 #include <string>
@@ -24,10 +27,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
diff --git a/src/core/ext/transport/binder/utils/ndk_binder.cc b/src/core/ext/transport/binder/utils/ndk_binder.cc
index 95b52789803..8997255d7d7 100644
--- a/src/core/ext/transport/binder/utils/ndk_binder.cc
+++ b/src/core/ext/transport/binder/utils/ndk_binder.cc
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver.h b/src/core/ext/transport/binder/utils/transport_stream_receiver.h
index fa7dd21472d..a7f22d40c59 100644
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver.h
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/transaction.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
index 5a3cc10cb27..af1f4071104 100644
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
index a671a5e8233..a5548aba89c 100644
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+++ b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 #include <queue>
@@ -22,8 +24,6 @@
 #include <string>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/ext/transport/binder/wire_format/binder.h b/src/core/ext/transport/binder/wire_format/binder.h
index 7936fbb65ce..77ab16597e8 100644
--- a/src/core/ext/transport/binder/wire_format/binder.h
+++ b/src/core/ext/transport/binder/wire_format/binder.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -22,9 +24,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder_constants.h"
 #include "src/core/util/orphanable.h"
 
diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc
index e2a55df6b01..bc808e09bca 100644
--- a/src/core/ext/transport/binder/wire_format/binder_android.cc
+++ b/src/core/ext/transport/binder/wire_format/binder_android.cc
@@ -24,7 +24,6 @@
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/ext/transport/binder/wire_format/binder_android.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/ext/transport/binder/wire_format/binder_android.h b/src/core/ext/transport/binder/wire_format/binder_android.h
index a11b9bb8957..7d59a5fa00d 100644
--- a/src/core/ext/transport/binder/wire_format/binder_android.h
+++ b/src/core/ext/transport/binder/wire_format/binder_android.h
@@ -24,7 +24,6 @@
 #include <memory>
 
 #include "absl/memory/memory.h"
-
 #include "src/core/ext/transport/binder/utils/binder_auto_utils.h"
 #include "src/core/ext/transport/binder/utils/ndk_binder.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
diff --git a/src/core/ext/transport/binder/wire_format/binder_constants.h b/src/core/ext/transport/binder/wire_format/binder_constants.h
index 562f248ec0d..0dacaa742c0 100644
--- a/src/core/ext/transport/binder/wire_format/binder_constants.h
+++ b/src/core/ext/transport/binder/wire_format/binder_constants.h
@@ -15,12 +15,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 
 #include "absl/base/attributes.h"
 
-#include <grpc/support/port_platform.h>
-
 using transaction_code_t = uint32_t;
 
 ABSL_CONST_INIT extern const int FIRST_CALL_TRANSACTION;
diff --git a/src/core/ext/transport/binder/wire_format/transaction.h b/src/core/ext/transport/binder/wire_format/transaction.h
index eda30d093a5..0b22f8a60e9 100644
--- a/src/core/ext/transport/binder/wire_format/transaction.h
+++ b/src/core/ext/transport/binder/wire_format/transaction.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_binder {
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader.h b/src/core/ext/transport/binder/wire_format/wire_reader.h
index 570f99ac683..e446342af62 100644
--- a/src/core/ext/transport/binder/wire_format/wire_reader.h
+++ b/src/core/ext/transport/binder/wire_format/wire_reader.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_writer.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
index d877b9cd9c1..5d8144650ac 100644
--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
@@ -29,7 +29,6 @@
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_writer.h"
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
index a08cb6f4985..8c8c4e939f7 100644
--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+++ b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <memory>
 #include <queue>
 #include <utility>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.cc b/src/core/ext/transport/binder/wire_format/wire_writer.cc
index 1cefd1bd5f2..948f16d2ee9 100644
--- a/src/core/ext/transport/binder/wire_format/wire_writer.cc
+++ b/src/core/ext/transport/binder/wire_format/wire_writer.cc
@@ -24,7 +24,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/variant.h"
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.h b/src/core/ext/transport/binder/wire_format/wire_writer.h
index 81041c68c02..81848296323 100644
--- a/src/core/ext/transport/binder/wire_format/wire_writer.h
+++ b/src/core/ext/transport/binder/wire_format/wire_writer.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/transaction.h"
 #include "src/core/lib/iomgr/combiner.h"
diff --git a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
index b3df1ceb1e6..3616797a3bb 100644
--- a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
+++ b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <utility>
 
 #include "absl/log/log.h"
 #include "absl/random/random.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
index d8743703a04..ae9317e3b89 100644
--- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
+++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <utility>
@@ -23,10 +26,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
diff --git a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
index 59ef8fd4376..963c8da55be 100644
--- a/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
+++ b/src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_CHAOTIC_GOOD_CONNECTOR_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 
 #include "absl/random/random.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc
index 29a39c1fbac..3d585191bca 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good/client_transport.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <cstdlib>
 #include <memory>
@@ -27,11 +31,6 @@
 #include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h
index f223c551002..997f03d6120 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.h
+++ b/src/core/ext/transport/chaotic_good/client_transport.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CLIENT_TRANSPORT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -32,12 +36,6 @@
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc
index dccdf7f0dc5..5fbb51d070b 100644
--- a/src/core/ext/transport/chaotic_good/frame.cc
+++ b/src/core/ext/transport/chaotic_good/frame.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/ext/transport/chaotic_good/frame.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,10 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h
index a328c3c80ce..d29545e87c8 100644
--- a/src/core/ext/transport/chaotic_good/frame.h
+++ b/src/core/ext/transport/chaotic_good/frame.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -22,9 +24,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/status.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/src/core/ext/transport/chaotic_good/frame_header.cc b/src/core/ext/transport/chaotic_good/frame_header.cc
index 903e4646419..7cc9a0d7b91 100644
--- a/src/core/ext/transport/chaotic_good/frame_header.cc
+++ b/src/core/ext/transport/chaotic_good/frame_header.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace chaotic_good {
 
diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h
index 91a83eed4a8..202e8387441 100644
--- a/src/core/ext/transport/chaotic_good/frame_header.h
+++ b/src/core/ext/transport/chaotic_good/frame_header.h
@@ -15,14 +15,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_FRAME_HEADER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/bitset.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
index f5c8dc2d685..749a27155bd 100644
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <random>
@@ -26,12 +31,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
diff --git a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
index 167da14458d..8b555264aab 100644
--- a/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
+++ b/src/core/ext/transport/chaotic_good/server/chaotic_good_server.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_CHAOTIC_GOOD_SERVER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -25,10 +28,6 @@
 #include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index 492dee5c843..b166d79380f 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <tuple>
@@ -24,12 +29,6 @@
 #include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h
index d8244ab32fe..49fd5ae015f 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.h
+++ b/src/core/ext/transport/chaotic_good/server_transport.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -37,13 +42,6 @@
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.cc b/src/core/ext/transport/chaotic_good/settings_metadata.cc
index 3d952be719a..a3b8c5642d3 100644
--- a/src/core/ext/transport/chaotic_good/settings_metadata.cc
+++ b/src/core/ext/transport/chaotic_good/settings_metadata.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/ext/transport/chaotic_good/settings_metadata.h"
 
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
 #include "src/core/util/crash.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chaotic_good/settings_metadata.h b/src/core/ext/transport/chaotic_good/settings_metadata.h
index fab73696446..81b5fca4f21 100644
--- a/src/core/ext/transport/chaotic_good/settings_metadata.h
+++ b/src/core/ext/transport/chaotic_good/settings_metadata.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SETTINGS_METADATA_H
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
diff --git a/src/core/ext/transport/chttp2/alpn/alpn.cc b/src/core/ext/transport/chttp2/alpn/alpn.cc
index 75f17402335..cd6119f4782 100644
--- a/src/core/ext/transport/chttp2/alpn/alpn.cc
+++ b/src/core/ext/transport/chttp2/alpn/alpn.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/useful.h"
 
 // in order of preference
diff --git a/src/core/ext/transport/chttp2/alpn/alpn.h b/src/core/ext/transport/chttp2/alpn/alpn.h
index 9c381f8b3b2..09135e90ae2 100644
--- a/src/core/ext/transport/chttp2/alpn/alpn.h
+++ b/src/core/ext/transport/chttp2/alpn/alpn.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_ALPN_ALPN_H
 
-#include <string.h>
-
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 // Returns 1 if the version is supported, 0 otherwise.
 int grpc_chttp2_is_alpn_version_supported(const char* version, size_t size);
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/src/core/ext/transport/chttp2/client/chttp2_connector.cc
index 2f6e070ae6a..0223539a450 100644
--- a/src/core/ext/transport/chttp2/client/chttp2_connector.cc
+++ b/src/core/ext/transport/chttp2/client/chttp2_connector.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/ext/transport/chttp2/client/chttp2_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_posix.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 
 #include <string>
@@ -29,16 +37,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_posix.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_factory.h"
 #include "src/core/client_channel/client_channel_filter.h"
diff --git a/src/core/ext/transport/chttp2/client/chttp2_connector.h b/src/core/ext/transport/chttp2/client/chttp2_connector.h
index 4c7eaa614da..800e08a8ec1 100644
--- a/src/core/ext/transport/chttp2/client/chttp2_connector.h
+++ b/src/core/ext/transport/chttp2/client/chttp2_connector.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_CLIENT_CHTTP2_CONNECTOR_H
 
-#include "absl/base/thread_annotations.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/types/optional.h"
 #include "src/core/client_channel/connector.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index ac0562c4117..0486f7e3bf5 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/ext/transport/chttp2/server/chttp2_server.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_posix.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/passive_listener.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -38,16 +46,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_posix.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/passive_listener.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.h b/src/core/ext/transport/chttp2/server/chttp2_server.h
index 25d38236aed..0ecbf39e745 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.h
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_SERVER_CHTTP2_SERVER_H
 
-#include <functional>
-
 #include <grpc/passive_listener.h>
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/server/server.h"
diff --git a/src/core/ext/transport/chttp2/transport/.clang-format b/src/core/ext/transport/chttp2/transport/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/ext/transport/chttp2/transport/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.cc b/src/core/ext/transport/chttp2/transport/bin_decoder.cc
index 8d00da86e59..d996de7315e 100644
--- a/src/core/ext/transport/chttp2/transport/bin_decoder.cc
+++ b/src/core/ext/transport/chttp2/transport/bin_decoder.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_decoder.h"
 
-#include "absl/base/attributes.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/attributes.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 
 static uint8_t decode_table[] = {
diff --git a/src/core/ext/transport/chttp2/transport/bin_decoder.h b/src/core/ext/transport/chttp2/transport/bin_decoder.h
index fc87450d365..4af97f54907 100644
--- a/src/core/ext/transport/chttp2/transport/bin_decoder.h
+++ b/src/core/ext/transport/chttp2/transport/bin_decoder.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_DECODER_H
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
+#include <stdint.h>
 
 struct grpc_base64_decode_context {
   // input/output:
diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.cc b/src/core/ext/transport/chttp2/transport/bin_encoder.cc
index 4063d1d5491..8a6b3670ce1 100644
--- a/src/core/ext/transport/chttp2/transport/bin_encoder.cc
+++ b/src/core/ext/transport/chttp2/transport/bin_encoder.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/huffsyms.h"
 
 static const char alphabet[] =
diff --git a/src/core/ext/transport/chttp2/transport/bin_encoder.h b/src/core/ext/transport/chttp2/transport/bin_encoder.h
index fbada017abc..5e561036f8f 100644
--- a/src/core/ext/transport/chttp2/transport/bin_encoder.h
+++ b/src/core/ext/transport/chttp2/transport/bin_encoder.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_BIN_ENCODER_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 // base64 encode a slice. Returns a new slice, does not take ownership of the
 // input
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index 4087efcf6dd..61c560e0d21 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -16,6 +16,15 @@
 
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <string.h>
@@ -45,17 +54,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
index c832da4ed9e..011eeae1a0c 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <string>
 
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/ext/transport/chttp2/transport/context_list_entry.h b/src/core/ext/transport/chttp2/transport/context_list_entry.h
index 8d64b321aef..583e8ed522f 100644
--- a/src/core/ext/transport/chttp2/transport/context_list_entry.h
+++ b/src/core/ext/transport/chttp2/transport/context_list_entry.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CONTEXT_LIST_ENTRY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CONTEXT_LIST_ENTRY_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,8 +27,6 @@
 #include <utility>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/tcp_tracer.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/decode_huff.h b/src/core/ext/transport/chttp2/transport/decode_huff.h
index 2562f9d0d97..21f087585c0 100644
--- a/src/core/ext/transport/chttp2/transport/decode_huff.h
+++ b/src/core/ext/transport/chttp2/transport/decode_huff.h
@@ -17,10 +17,10 @@
 
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_DECODE_HUFF_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_DECODE_HUFF_H
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
-
-#include <grpc/support/port_platform.h>
 namespace grpc_core {
 class HuffDecoderCommon {
  protected:
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
index c80fdd83073..b65ab0e12a5 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.cc
+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -32,9 +33,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h
index d3f1202a217..c7050b99daf 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.h
+++ b/src/core/ext/transport/chttp2/transport/flow_control.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FLOW_CONTROL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FLOW_CONTROL_H
 
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 
@@ -31,9 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame.cc b/src/core/ext/transport/chttp2/transport/frame.cc
index 65bb1660248..cd9093f94a9 100644
--- a/src/core/ext/transport/chttp2/transport/frame.cc
+++ b/src/core/ext/transport/chttp2/transport/frame.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -22,9 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/frame.h b/src/core/ext/transport/chttp2/transport/frame.h
index ac6b9e771dd..ccefc083f92 100644
--- a/src/core/ext/transport/chttp2/transport/frame.h
+++ b/src/core/ext/transport/chttp2/transport/frame.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -23,9 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/frame_data.cc b/src/core/ext/transport/chttp2/transport/frame_data.cc
index b5bd13d2fc0..d03e47fa71d 100644
--- a/src/core/ext/transport/chttp2/transport/frame_data.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_data.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_data.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_data.h b/src/core/ext/transport/chttp2/transport/frame_data.h
index eae1f439c3d..e107b740f89 100644
--- a/src/core/ext/transport/chttp2/transport/frame_data.h
+++ b/src/core/ext/transport/chttp2/transport/frame_data.h
@@ -21,13 +21,11 @@
 
 // Parser for GRPC streams embedded in DATA frames
 
-#include <stdint.h>
-
-#include "absl/status/status.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
+#include "absl/status/status.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/src/core/ext/transport/chttp2/transport/frame_goaway.cc
index 31e7c76ba39..36873e862e3 100644
--- a/src/core/ext/transport/chttp2/transport/frame_goaway.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_goaway.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/base/attributes.h"
@@ -25,11 +28,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 
 void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p) {
diff --git a/src/core/ext/transport/chttp2/transport/frame_goaway.h b/src/core/ext/transport/chttp2/transport/frame_goaway.h
index 40f132721e7..a455f06c24f 100644
--- a/src/core/ext/transport/chttp2/transport/frame_goaway.h
+++ b/src/core/ext/transport/chttp2/transport/frame_goaway.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_GOAWAY_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.cc b/src/core/ext/transport/chttp2/transport/frame_ping.cc
index 7b7b080e320..2db29ee7ef6 100644
--- a/src/core/ext/transport/chttp2/transport/frame_ping.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_ping.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_ping.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -28,10 +30,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h"
 #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_ping.h b/src/core/ext/transport/chttp2/transport/frame_ping.h
index 6f4cd55ff41..a785a9dfa35 100644
--- a/src/core/ext/transport/chttp2/transport/frame_ping.h
+++ b/src/core/ext/transport/chttp2/transport/frame_ping.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_PING_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
index 0e38b36c05c..0378d6773c0 100644
--- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_rst_stream.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
@@ -26,10 +28,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
index 0e8e74b62a2..d55ab2831d0 100644
--- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
+++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.cc b/src/core/ext/transport/chttp2/transport/frame_settings.cc
index 817097a57b2..84dafd73827 100644
--- a/src/core/ext/transport/chttp2/transport/frame_settings.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_settings.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_settings.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -26,10 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_settings.h b/src/core/ext/transport/chttp2/transport/frame_settings.h
index 011862f5888..b5480b64029 100644
--- a/src/core/ext/transport/chttp2/transport/frame_settings.h
+++ b/src/core/ext/transport/chttp2/transport/frame_settings.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
index 5209ab2899a..47db0a03941 100644
--- a/src/core/ext/transport/chttp2/transport/frame_window_update.cc
+++ b/src/core/ext/transport/chttp2/transport/frame_window_update.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/frame_window_update.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
diff --git a/src/core/ext/transport/chttp2/transport/frame_window_update.h b/src/core/ext/transport/chttp2/transport/frame_window_update.h
index 53c5f41d3db..c1c8f6e8251 100644
--- a/src/core/ext/transport/chttp2/transport/frame_window_update.h
+++ b/src/core/ext/transport/chttp2/transport/frame_window_update.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_constants.h b/src/core/ext/transport/chttp2/transport/hpack_constants.h
index 739c57ba3e3..d709e0ba278 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_constants.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_constants.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_CONSTANTS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <cstdint>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace hpack_constants {
 // Per entry overhead bytes as per the spec
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
index 5c573a0beb6..1ae3db3d609 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.cc
@@ -18,16 +18,15 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <cstdint>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder.h b/src/core/ext/transport/chttp2/transport/hpack_encoder.h
index 1dab0871ff2..4695089b01a 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -29,10 +31,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
index 143781dca32..2947587c7a6 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
@@ -14,12 +14,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 uint32_t HPackEncoderTable::AllocateIndex(size_t element_size) {
diff --git a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
index 1bde664d0fd..f68e2995b2b 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_TABLE_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_ENCODER_TABLE_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
index aa4b69623ad..ffead9117a9 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
@@ -14,13 +14,11 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
index 628b3327f5b..6aea73bc5b7 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parse_result.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSE_RESULT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSE_RESULT_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,9 +27,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/surface/validate_metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
index fb2e9b301a9..82d249f2ce0 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdlib.h>
 
@@ -36,10 +38,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.h b/src/core/ext/transport/chttp2/transport/hpack_parser.h
index af2c1a9c7f0..5417c9e0213 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -32,10 +34,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
index 7a0b7bd8498..b258e6ead09 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -30,9 +31,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h
index 2d790bb2e21..1ccb0808c43 100644
--- a/src/core/ext/transport/chttp2/transport/hpack_parser_table.h
+++ b/src/core/ext/transport/chttp2/transport/hpack_parser_table.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_TABLE_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_TABLE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstdint>
@@ -28,9 +29,6 @@
 #include <vector>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_constants.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parse_result.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.cc b/src/core/ext/transport/chttp2/transport/http2_settings.cc
index ac9c1553301..83bf6e5c5d8 100644
--- a/src/core/ext/transport/chttp2/transport/http2_settings.cc
+++ b/src/core/ext/transport/chttp2/transport/http2_settings.cc
@@ -20,10 +20,9 @@
 
 #include "src/core/ext/transport/chttp2/transport/http2_settings.h"
 
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 #include "src/core/lib/transport/http2_errors.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/ext/transport/chttp2/transport/http2_settings.h b/src/core/ext/transport/chttp2/transport/http2_settings.h
index b5debf96c7e..44ed672d123 100644
--- a/src/core/ext/transport/chttp2/transport/http2_settings.h
+++ b/src/core/ext/transport/chttp2/transport/http2_settings.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HTTP2_SETTINGS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstdint>
@@ -24,9 +25,6 @@
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 #include "src/core/lib/transport/http2_errors.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h
index 76deea4f043..afe319b81a2 100644
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@@ -19,6 +19,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_INTERNAL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -32,14 +38,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc
index e9d746d8e24..7fa290db466 100644
--- a/src/core/ext/transport/chttp2/transport/parsing.cc
+++ b/src/core/ext/transport/chttp2/transport/parsing.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -36,12 +40,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
index d1f371537f7..e2652964058 100644
--- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
+++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
index bff04089822..22e6b03b778 100644
--- a/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
+++ b/src/core/ext/transport/chttp2/transport/ping_abuse_policy.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_ABUSE_POLICY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_ABUSE_POLICY_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.cc b/src/core/ext/transport/chttp2/transport/ping_callbacks.cc
index 4bd16e1fbb4..ff473e59630 100644
--- a/src/core/ext/transport/chttp2/transport/ping_callbacks.cc
+++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_callbacks.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/meta/type_traits.h"
 #include "absl/random/distributions.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void Chttp2PingCallbacks::OnPing(Callback on_start, Callback on_ack) {
diff --git a/src/core/ext/transport/chttp2/transport/ping_callbacks.h b/src/core/ext/transport/chttp2/transport/ping_callbacks.h
index 1e558eda836..deae3da479f 100644
--- a/src/core/ext/transport/chttp2/transport/ping_callbacks.h
+++ b/src/core/ext/transport/chttp2/transport/ping_callbacks.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_CALLBACKS_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_CALLBACKS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,10 +28,6 @@
 #include "absl/hash/hash.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc
index 6f329735306..b895e518202 100644
--- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc
+++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_rate_policy.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <ostream>
 
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/util/match.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h
index df16b3813bc..b49d5323a43 100644
--- a/src/core/ext/transport/chttp2/transport/ping_rate_policy.h
+++ b/src/core/ext/transport/chttp2/transport/ping_rate_policy.h
@@ -15,15 +15,13 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_RATE_POLICY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_PING_RATE_POLICY_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <iosfwd>
 #include <string>
 
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/ext/transport/chttp2/transport/stream_lists.cc b/src/core/ext/transport/chttp2/transport/stream_lists.cc
index 14039a614b7..2bf7daa04f7 100644
--- a/src/core/ext/transport/chttp2/transport/stream_lists.cc
+++ b/src/core/ext/transport/chttp2/transport/stream_lists.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/ext/transport/chttp2/transport/stream_lists.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/ext/transport/chttp2/transport/varint.cc b/src/core/ext/transport/chttp2/transport/varint.cc
index 7af77e772be..1db7d67c06f 100644
--- a/src/core/ext/transport/chttp2/transport/varint.cc
+++ b/src/core/ext/transport/chttp2/transport/varint.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/ext/transport/chttp2/transport/varint.h"
 
-#include "absl/base/attributes.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/attributes.h"
+
 namespace grpc_core {
 
 size_t VarintLength(size_t tail_value) {
diff --git a/src/core/ext/transport/chttp2/transport/varint.h b/src/core/ext/transport/chttp2/transport/varint.h
index 3dcf32aa609..e84f1b6ee21 100644
--- a/src/core/ext/transport/chttp2/transport/varint.h
+++ b/src/core/ext/transport/chttp2/transport/varint.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_VARINT_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 // Helpers for hpack varint encoding
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.cc b/src/core/ext/transport/chttp2/transport/write_size_policy.cc
index 63e8d2b7e25..b843205de70 100644
--- a/src/core/ext/transport/chttp2/transport/write_size_policy.cc
+++ b/src/core/ext/transport/chttp2/transport/write_size_policy.cc
@@ -14,12 +14,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/write_size_policy.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 size_t Chttp2WriteSizePolicy::WriteTargetSize() { return current_target_; }
diff --git a/src/core/ext/transport/chttp2/transport/write_size_policy.h b/src/core/ext/transport/chttp2/transport/write_size_policy.h
index fdeeda0763a..6f0098e69b1 100644
--- a/src/core/ext/transport/chttp2/transport/write_size_policy.h
+++ b/src/core/ext/transport/chttp2/transport/write_size_policy.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_WRITE_SIZE_POLICY_H
 #define GRPC_SRC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_WRITE_SIZE_POLICY_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc
index 583d9eaa03d..8aa306ab680 100644
--- a/src/core/ext/transport/chttp2/transport/writing.cc
+++ b/src/core/ext/transport/chttp2/transport/writing.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -30,12 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/call_tracer_wrapper.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
diff --git a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
index a7c59b26d94..538c6aa2ee0 100644
--- a/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
+++ b/src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/ext/transport/cronet/client/secure/cronet_channel_create.h"
 
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
 #include "src/core/ext/transport/cronet/transport/cronet_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc
index f0befc2faa1..25b80945e5b 100644
--- a/src/core/ext/transport/cronet/transport/cronet_api_phony.cc
+++ b/src/core/ext/transport/cronet/transport/cronet_api_phony.cc
@@ -19,11 +19,11 @@
 // This file has empty implementation of all the functions exposed by the cronet
 // library, so we can build it in all environments
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifdef GRPC_COMPILE_WITH_CRONET
 // link with the real CRONET library in the build system
 #else
diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc
index 4d47895f9bb..1e1ad321bb8 100644
--- a/src/core/ext/transport/cronet/transport/cronet_transport.cc
+++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc
@@ -18,6 +18,12 @@
 
 #include "src/core/ext/transport/cronet/transport/cronet_transport.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,15 +40,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_decoder.h"
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/cronet/transport/cronet_status.h"
@@ -61,6 +58,7 @@
 #include "src/core/util/crash.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/status_helper.h"
+#include "third_party/objective_c/Cronet/bidirectional_stream_c.h"
 
 // IWYU pragma: no_include <type_traits>
 
diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc
index a656d8b7fde..16846ac1960 100644
--- a/src/core/ext/transport/inproc/inproc_transport.cc
+++ b/src/core/ext/transport/inproc/inproc_transport.cc
@@ -14,16 +14,15 @@
 
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/inproc/legacy_inproc_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/src/core/ext/transport/inproc/legacy_inproc_transport.cc b/src/core/ext/transport/inproc/legacy_inproc_transport.cc
index b93fc97a160..fd7fc3f99b6 100644
--- a/src/core/ext/transport/inproc/legacy_inproc_transport.cc
+++ b/src/core/ext/transport/inproc/legacy_inproc_transport.cc
@@ -18,6 +18,13 @@
 
 #include "src/core/ext/transport/inproc/legacy_inproc_transport.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -34,15 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/src/core/filter/blackboard.h b/src/core/filter/blackboard.h
index 972758162f0..19f08be382b 100644
--- a/src/core/filter/blackboard.h
+++ b/src/core/filter/blackboard.h
@@ -22,7 +22,6 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
index 151f4e8c9d4..b6037bfe7cb 100644
--- a/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
+++ b/src/core/handshaker/endpoint_info/endpoint_info_handshaker.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/src/core/handshaker/handshaker.cc b/src/core/handshaker/handshaker.cc
index b476e550f75..241d656da80 100644
--- a/src/core/handshaker/handshaker.cc
+++ b/src/core/handshaker/handshaker.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/handshaker/handshaker.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <string>
@@ -29,13 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/handshaker.h b/src/core/handshaker/handshaker.h
index 12ea2b4b8bf..251ec6bf7cc 100644
--- a/src/core/handshaker/handshaker.h
+++ b/src/core/handshaker/handshaker.h
@@ -19,17 +19,15 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
 #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/container/inlined_vector.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/handshaker_registry.cc b/src/core/handshaker/handshaker_registry.cc
index 750fdabfdc0..e4e2380b46f 100644
--- a/src/core/handshaker/handshaker_registry.cc
+++ b/src/core/handshaker/handshaker_registry.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/handshaker/handshaker_registry.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void HandshakerRegistry::Builder::RegisterHandshakerFactory(
diff --git a/src/core/handshaker/handshaker_registry.h b/src/core/handshaker/handshaker_registry.h
index 1357686c6fb..b9ccba03fd8 100644
--- a/src/core/handshaker/handshaker_registry.h
+++ b/src/core/handshaker/handshaker_registry.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
 #define GRPC_SRC_CORE_HANDSHAKER_HANDSHAKER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/handshaker/http_connect/http_connect_handshaker.cc b/src/core/handshaker/http_connect/http_connect_handshaker.cc
index 3ec778ed4b1..68ca9ab73c7 100644
--- a/src/core/handshaker/http_connect/http_connect_handshaker.cc
+++ b/src/core/handshaker/http_connect/http_connect_handshaker.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <string.h>
 
@@ -31,12 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.cc b/src/core/handshaker/http_connect/http_proxy_mapper.cc
index f22e6d67423..4bd1e16ee50 100644
--- a/src/core/handshaker/http_connect/http_proxy_mapper.cc
+++ b/src/core/handshaker/http_connect/http_proxy_mapper.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/handshaker/http_connect/http_proxy_mapper.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -38,11 +41,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/src/core/handshaker/http_connect/http_proxy_mapper.h b/src/core/handshaker/http_connect/http_proxy_mapper.h
index 2a283833bd4..50fb2919c96 100644
--- a/src/core/handshaker/http_connect/http_proxy_mapper.h
+++ b/src/core/handshaker/http_connect/http_proxy_mapper.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
 #define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_HTTP_PROXY_MAPPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/handshaker/proxy_mapper.h b/src/core/handshaker/proxy_mapper.h
index 8ba3f740394..6ffe9467670 100644
--- a/src/core/handshaker/proxy_mapper.h
+++ b/src/core/handshaker/proxy_mapper.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
 #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
diff --git a/src/core/handshaker/proxy_mapper_registry.cc b/src/core/handshaker/proxy_mapper_registry.cc
index f13e07cc334..c02cac376c6 100644
--- a/src/core/handshaker/proxy_mapper_registry.cc
+++ b/src/core/handshaker/proxy_mapper_registry.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/handshaker/proxy_mapper_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ -25,8 +27,6 @@
 
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void ProxyMapperRegistry::Builder::Register(
diff --git a/src/core/handshaker/proxy_mapper_registry.h b/src/core/handshaker/proxy_mapper_registry.h
index fbc09f6152d..3c604ef9e0c 100644
--- a/src/core/handshaker/proxy_mapper_registry.h
+++ b/src/core/handshaker/proxy_mapper_registry.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
 #define GRPC_SRC_CORE_HANDSHAKER_PROXY_MAPPER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -26,9 +28,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/proxy_mapper.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/src/core/handshaker/security/secure_endpoint.cc b/src/core/handshaker/security/secure_endpoint.cc
index c57b56b4d26..02c39865a3f 100644
--- a/src/core/handshaker/security/secure_endpoint.cc
+++ b/src/core/handshaker/security/secure_endpoint.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/handshaker/security/secure_endpoint.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -31,16 +39,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/security/secure_endpoint.h b/src/core/handshaker/security/secure_endpoint.h
index 0d81fec090b..cb036d25766 100644
--- a/src/core/handshaker/security/secure_endpoint.h
+++ b/src/core/handshaker/security/secure_endpoint.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
 #define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURE_ENDPOINT_H
 
-#include <stddef.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/handshaker/security/security_handshaker.cc b/src/core/handshaker/security/security_handshaker.cc
index 82756fc8723..1e1102846df 100644
--- a/src/core/handshaker/security/security_handshaker.cc
+++ b/src/core/handshaker/security/security_handshaker.cc
@@ -18,6 +18,13 @@
 
 #include "src/core/handshaker/security/security_handshaker.h"
 
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
@@ -34,15 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
diff --git a/src/core/handshaker/security/security_handshaker.h b/src/core/handshaker/security/security_handshaker.h
index 3e6096d6c47..23c10b94fac 100644
--- a/src/core/handshaker/security/security_handshaker.h
+++ b/src/core/handshaker/security/security_handshaker.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H
 #define GRPC_SRC_CORE_HANDSHAKER_SECURITY_SECURITY_HANDSHAKER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
index a02ccfa8cc3..8dd1ff89d44 100644
--- a/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
+++ b/src/core/handshaker/tcp_connect/tcp_connect_handshaker.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
@@ -27,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/src/core/lib/address_utils/parse_address.cc b/src/core/lib/address_utils/parse_address.cc
index ce75321ce31..8a3c270a3d1 100644
--- a/src/core/lib/address_utils/parse_address.cc
+++ b/src/core/lib/address_utils/parse_address.cc
@@ -46,7 +46,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
 #include "src/core/util/grpc_if_nametoindex.h"
diff --git a/src/core/lib/address_utils/parse_address.h b/src/core/lib/address_utils/parse_address.h
index c11789885ab..840d0c260bc 100644
--- a/src/core/lib/address_utils/parse_address.h
+++ b/src/core/lib/address_utils/parse_address.h
@@ -19,13 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/uri.h"
diff --git a/src/core/lib/address_utils/sockaddr_utils.cc b/src/core/lib/address_utils/sockaddr_utils.cc
index 41564ba5242..b52491637c0 100644
--- a/src/core/lib/address_utils/sockaddr_utils.cc
+++ b/src/core/lib/address_utils/sockaddr_utils.cc
@@ -19,11 +19,10 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
 #include <errno.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
 #ifdef GRPC_HAVE_VSOCK
 #include <linux/vm_sockets.h>
 #endif
@@ -36,7 +35,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
diff --git a/src/core/lib/address_utils/sockaddr_utils.h b/src/core/lib/address_utils/sockaddr_utils.h
index 9837afd930b..c76aa64908a 100644
--- a/src/core/lib/address_utils/sockaddr_utils.h
+++ b/src/core/lib/address_utils/sockaddr_utils.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
 #define GRPC_SRC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/resolved_address.h"
 
 // Returns true if addr is an IPv4-mapped IPv6 address within the
diff --git a/src/core/lib/channel/call_finalization.h b/src/core/lib/channel/call_finalization.h
index 9e083e350a0..a3076677826 100644
--- a/src/core/lib/channel/call_finalization.h
+++ b/src/core/lib/channel/call_finalization.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CALL_FINALIZATION_H
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/call_final_info.h"
diff --git a/src/core/lib/channel/channel_args.cc b/src/core/lib/channel/channel_args.cc
index 1c66f414350..72802910ea0 100644
--- a/src/core/lib/channel/channel_args.cc
+++ b/src/core/lib/channel/channel_args.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/channel/channel_args.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,12 +38,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/useful.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/channel/channel_args.h b/src/core/lib/channel/channel_args.h
index 9274c453988..9a49c3dd3fd 100644
--- a/src/core/lib/channel/channel_args.h
+++ b/src/core/lib/channel/channel_args.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -32,11 +35,6 @@
 #include "absl/meta/type_traits.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/util/avl.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/channel/channel_args_preconditioning.cc b/src/core/lib/channel/channel_args_preconditioning.cc
index 92a94535d30..bb83515839d 100644
--- a/src/core/lib/channel/channel_args_preconditioning.cc
+++ b/src/core/lib/channel/channel_args_preconditioning.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 namespace grpc_core {
 
 void ChannelArgsPreconditioning::Builder::RegisterStage(Stage stage) {
diff --git a/src/core/lib/channel/channel_args_preconditioning.h b/src/core/lib/channel/channel_args_preconditioning.h
index 69f64accd34..ff4b43fc54b 100644
--- a/src/core/lib/channel/channel_args_preconditioning.h
+++ b/src/core/lib/channel/channel_args_preconditioning.h
@@ -15,12 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_ARGS_PRECONDITIONING_H
 
-#include <functional>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+#include <vector>
+
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/channel/channel_stack.cc b/src/core/lib/channel/channel_stack.cc
index 14e618a7fd8..0b0b0345538 100644
--- a/src/core/lib/channel/channel_stack.cc
+++ b/src/core/lib/channel/channel_stack.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/channel/channel_stack.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -25,9 +26,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/surface/channel_init.h"
diff --git a/src/core/lib/channel/channel_stack.h b/src/core/lib/channel/channel_stack.h
index 56bcb62f900..855354970b6 100644
--- a/src/core/lib/channel/channel_stack.h
+++ b/src/core/lib/channel/channel_stack.h
@@ -37,17 +37,16 @@
 // it can have an effect on the call status.
 //
 
-#include <stddef.h>
-
-#include <functional>
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
+
+#include <functional>
+#include <memory>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/lib/channel/channel_stack_builder.cc b/src/core/lib/channel/channel_stack_builder.cc
index 69c4fff4fe9..307176e08e1 100644
--- a/src/core/lib/channel/channel_stack_builder.cc
+++ b/src/core/lib/channel/channel_stack_builder.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/lib/channel/channel_stack_builder.h"
 
-#include <algorithm>
-
 #include <grpc/support/port_platform.h>
 
+#include <algorithm>
+
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h
index 6b3155fcbdb..b1e72116765 100644
--- a/src/core/lib/channel/channel_stack_builder.h
+++ b/src/core/lib/channel/channel_stack_builder.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/surface/channel_stack_type.h"
diff --git a/src/core/lib/channel/channel_stack_builder_impl.cc b/src/core/lib/channel/channel_stack_builder_impl.cc
index 360cd7aa7db..2d7bfc2fc47 100644
--- a/src/core/lib/channel/channel_stack_builder_impl.cc
+++ b/src/core/lib/channel/channel_stack_builder_impl.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -31,10 +33,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/channel/channel_stack_builder_impl.h b/src/core/lib/channel/channel_stack_builder_impl.h
index 78df9809c90..6de06ebba73 100644
--- a/src/core/lib/channel/channel_stack_builder_impl.h
+++ b/src/core/lib/channel/channel_stack_builder_impl.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_CHANNEL_STACK_BUILDER_IMPL_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc
index f65f5f74f29..6f8b1bb2913 100644
--- a/src/core/lib/channel/connected_channel.cc
+++ b/src/core/lib/channel/connected_channel.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/channel/connected_channel.h"
 
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -30,12 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/lib/channel/promise_based_filter.cc b/src/core/lib/channel/promise_based_filter.cc
index a0fc813ad5c..4488a56b680 100644
--- a/src/core/lib/channel/promise_based_filter.cc
+++ b/src/core/lib/channel/promise_based_filter.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/channel/promise_based_filter.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -28,10 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 1a31b901052..d18809dca6b 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -19,6 +19,9 @@
 // promise-style. Most of this will be removed once the promises conversion is
 // completed.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -37,11 +40,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/filter/blackboard.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/channel/status_util.cc b/src/core/lib/channel/status_util.cc
index 7c78ac5504a..2caa7da563a 100644
--- a/src/core/lib/channel/status_util.cc
+++ b/src/core/lib/channel/status_util.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/channel/status_util.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/useful.h"
 
 struct status_string_entry {
diff --git a/src/core/lib/channel/status_util.h b/src/core/lib/channel/status_util.h
index cc46bd4feb0..fe6d47e4a70 100644
--- a/src/core/lib/channel/status_util.h
+++ b/src/core/lib/channel/status_util.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
 #define GRPC_SRC_CORE_LIB_CHANNEL_STATUS_UTIL_H
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 /// If \a status_str is a valid status string, sets \a status to the
 /// corresponding status value and returns true.
 bool grpc_status_code_from_string(const char* status_str,
diff --git a/src/core/lib/compression/compression.cc b/src/core/lib/compression/compression.cc
index 018e92a379a..1a6e1e81dc4 100644
--- a/src/core/lib/compression/compression.cc
+++ b/src/core/lib/compression/compression.cc
@@ -16,16 +16,14 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
-#include "absl/types/optional.h"
-
 #include <grpc/compression.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
+#include <string.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc
index 3bb8a7f2882..d81670a3d1d 100644
--- a/src/core/lib/compression/compression_internal.cc
+++ b/src/core/lib/compression/compression_internal.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/compression/compression_internal.h"
 
+#include <grpc/compression.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <string>
@@ -27,10 +29,6 @@
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/compression.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/compression/compression_internal.h b/src/core/lib/compression/compression_internal.h
index 45a24faa998..6f417feaf95 100644
--- a/src/core/lib/compression/compression_internal.h
+++ b/src/core/lib/compression/compression_internal.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_COMPRESSION_COMPRESSION_INTERNAL_H
 
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <initializer_list>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/compression_types.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/bitset.h"
diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc
index 9fb7a7956ac..7a731495e4a 100644
--- a/src/core/lib/compression/message_compress.cc
+++ b/src/core/lib/compression/message_compress.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/lib/compression/message_compress.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
-
 #include <zconf.h>
 #include <zlib.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 
 #define OUTPUT_BLOCK_SIZE 1024
diff --git a/src/core/lib/config/config_vars.cc b/src/core/lib/config/config_vars.cc
index e0db62f5d09..6aa9f551d71 100644
--- a/src/core/lib/config/config_vars.cc
+++ b/src/core/lib/config/config_vars.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/config/config_vars.h"
 
-#include "absl/flags/flag.h"
-#include "absl/strings/escaping.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/flags/flag.h"
+#include "absl/strings/escaping.h"
 #include "src/core/lib/config/load_config.h"
 
 #ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING
diff --git a/src/core/lib/config/config_vars.h b/src/core/lib/config/config_vars.h
index 32220cd1f17..b7ea541ad92 100644
--- a/src/core/lib/config/config_vars.h
+++ b/src/core/lib/config/config_vars.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H
 #define GRPC_SRC_CORE_LIB_CONFIG_CONFIG_VARS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -27,8 +28,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 class GPR_DLL ConfigVars {
diff --git a/src/core/lib/config/config_vars_non_generated.cc b/src/core/lib/config/config_vars_non_generated.cc
index 2f86246f2b7..78af08c1d8d 100644
--- a/src/core/lib/config/config_vars_non_generated.cc
+++ b/src/core/lib/config/config_vars_non_generated.cc
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/config/core_configuration.cc b/src/core/lib/config/core_configuration.cc
index 474ec3b56c4..3623ac53d8f 100644
--- a/src/core/lib/config/core_configuration.cc
+++ b/src/core/lib/config/core_configuration.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/lib/config/core_configuration.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <utility>
 #include <vector>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 std::atomic<CoreConfiguration*> CoreConfiguration::config_{nullptr};
diff --git a/src/core/lib/config/core_configuration.h b/src/core/lib/config/core_configuration.h
index 400278bd5ea..aa2f79c64fe 100644
--- a/src/core/lib/config/core_configuration.h
+++ b/src/core/lib/config/core_configuration.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
 #define GRPC_SRC_CORE_LIB_CONFIG_CORE_CONFIGURATION_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/handshaker/proxy_mapper_registry.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/src/core/lib/config/load_config.cc b/src/core/lib/config/load_config.cc
index 3d52fc4db03..afceacc7e4f 100644
--- a/src/core/lib/config/load_config.cc
+++ b/src/core/lib/config/load_config.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/config/load_config.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 
 #include "absl/flags/marshalling.h"
@@ -21,9 +22,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/env.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/config/load_config.h b/src/core/lib/config/load_config.h
index a668174193f..c0a1fe486cd 100644
--- a/src/core/lib/config/load_config.h
+++ b/src/core/lib/config/load_config.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H
 #define GRPC_SRC_CORE_LIB_CONFIG_LOAD_CONFIG_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -24,8 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 std::string LoadConfigFromEnv(absl::string_view environment_variable,
diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc
index 920c5d491c9..3eb004ec232 100644
--- a/src/core/lib/debug/trace.cc
+++ b/src/core/lib/debug/trace.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/debug/trace.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <type_traits>
 #include <utility>
@@ -28,10 +31,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/glob.h"
 
diff --git a/src/core/lib/debug/trace_flags.cc b/src/core/lib/debug/trace_flags.cc
index 03bfe06312c..29963b4c1f6 100644
--- a/src/core/lib/debug/trace_flags.cc
+++ b/src/core/lib/debug/trace_flags.cc
@@ -17,7 +17,6 @@
 //
 
 #include "absl/container/flat_hash_map.h"
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/src/core/lib/debug/trace_impl.h b/src/core/lib/debug/trace_impl.h
index 4d91c374d02..5d43e103433 100644
--- a/src/core/lib/debug/trace_impl.h
+++ b/src/core/lib/debug/trace_impl.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_DEBUG_TRACE_IMPL_H
 #define GRPC_SRC_CORE_LIB_DEBUG_TRACE_IMPL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <map>
 #include <string>
@@ -23,8 +25,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 #ifdef _WIN32
 #undef ERROR
 #endif
diff --git a/src/core/lib/event_engine/ares_resolver.cc b/src/core/lib/event_engine/ares_resolver.cc
index f1faf409241..1d38e9b827b 100644
--- a/src/core/lib/event_engine/ares_resolver.cc
+++ b/src/core/lib/event_engine/ares_resolver.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/ares_resolver.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 // IWYU pragma: no_include <ares_version.h>
@@ -42,6 +42,7 @@
 #include "src/core/lib/event_engine/nameser.h"  // IWYU pragma: keep
 #endif
 
+#include <grpc/event_engine/event_engine.h>
 #include <string.h>
 
 #include <algorithm>
@@ -59,9 +60,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/src/core/lib/event_engine/ares_resolver.h b/src/core/lib/event_engine/ares_resolver.h
index 331e533b35f..e9ca598d82e 100644
--- a/src/core/lib/event_engine/ares_resolver.h
+++ b/src/core/lib/event_engine/ares_resolver.h
@@ -14,30 +14,27 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_ARES_RESOLVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 
 #if GRPC_ARES == 1
 
+#include <ares.h>
+#include <grpc/event_engine/event_engine.h>
+
 #include <list>
 #include <memory>
 
-#include <ares.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/ref_counted_dns_resolver_interface.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/lib/event_engine/cf_engine/cf_engine.cc b/src/core/lib/event_engine/cf_engine/cf_engine.cc
index cc80e9977b6..a4c61521a29 100644
--- a/src/core/lib/event_engine/cf_engine/cf_engine.cc
+++ b/src/core/lib/event_engine/cf_engine/cf_engine.cc
@@ -19,12 +19,10 @@
 #ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include <CoreFoundation/CoreFoundation.h>
+#include <grpc/support/cpu.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/cpu.h>
-
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h"
 #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h"
diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
index 7a5f15b4208..9f7235aaa00 100644
--- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
+++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
@@ -21,7 +21,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/event_engine/cf_engine/cfstream_endpoint.h"
 #include "src/core/util/strerror.h"
 
diff --git a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
index 8623dc888f0..04d8f8bf640 100644
--- a/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
+++ b/src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
@@ -20,11 +20,9 @@
 #ifdef AVAILABLE_MAC_OS_X_VERSION_10_12_AND_LATER
 
 #include <CoreFoundation/CoreFoundation.h>
-
-#include "absl/strings/str_format.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "absl/strings/str_format.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/lib/event_engine/cf_engine/cftype_unique_ref.h"
diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
index a4fd9758ae5..c75b62b8f98 100644
--- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
+++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
@@ -21,7 +21,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/event_engine/cf_engine/dns_service_resolver.h"
 #include "src/core/lib/event_engine/posix_engine/lockfree_event.h"
diff --git a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h
index e9c464029b3..01d69b95cc8 100644
--- a/src/core/lib/event_engine/cf_engine/dns_service_resolver.h
+++ b/src/core/lib/event_engine/cf_engine/dns_service_resolver.h
@@ -21,12 +21,10 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <dns_sd.h>
+#include <grpc/event_engine/event_engine.h>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.cc b/src/core/lib/event_engine/channel_args_endpoint_config.cc
index 6cc79a7028a..41dd385080e 100644
--- a/src/core/lib/event_engine/channel_args_endpoint_config.cc
+++ b/src/core/lib/event_engine/channel_args_endpoint_config.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 
-#include <string>
-
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/channel_args_endpoint_config.h b/src/core/lib/event_engine/channel_args_endpoint_config.h
index c14735e3376..91000223bf2 100644
--- a/src/core/lib/event_engine/channel_args_endpoint_config.h
+++ b/src/core/lib/event_engine/channel_args_endpoint_config.h
@@ -14,12 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_CHANNEL_ARGS_ENDPOINT_CONFIG_H
 
-#include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/common_closures.h b/src/core/lib/event_engine/common_closures.h
index 007f352cbb8..52a8477be17 100644
--- a/src/core/lib/event_engine/common_closures.h
+++ b/src/core/lib/event_engine/common_closures.h
@@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_COMMON_CLOSURES_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/default_event_engine.cc b/src/core/lib/event_engine/default_event_engine.cc
index 24282e7921b..7b005d02d8e 100644
--- a/src/core/lib/event_engine/default_event_engine.cc
+++ b/src/core/lib/event_engine/default_event_engine.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/default_event_engine.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <memory>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/event_engine/default_event_engine.h b/src/core/lib/event_engine/default_event_engine.h
index 2f7c982ab4c..2a254d49586 100644
--- a/src/core/lib/event_engine/default_event_engine.h
+++ b/src/core/lib/event_engine/default_event_engine.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/debug_location.h"
 
diff --git a/src/core/lib/event_engine/default_event_engine_factory.cc b/src/core/lib/event_engine/default_event_engine_factory.cc
index d48aa2fba03..8f91ad64431 100644
--- a/src/core/lib/event_engine/default_event_engine_factory.cc
+++ b/src/core/lib/event_engine/default_event_engine_factory.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/lib/event_engine/default_event_engine_factory.h"
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #if defined(GPR_WINDOWS)
 #include "src/core/lib/event_engine/windows/windows_engine.h"
 
diff --git a/src/core/lib/event_engine/default_event_engine_factory.h b/src/core/lib/event_engine/default_event_engine_factory.h
index a32f04ff6be..3e97c4e480b 100644
--- a/src/core/lib/event_engine/default_event_engine_factory.h
+++ b/src/core/lib/event_engine/default_event_engine_factory.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/event_engine.cc b/src/core/lib/event_engine/event_engine.cc
index 5a162f871a1..0a16cba4dbc 100644
--- a/src/core/lib/event_engine/event_engine.cc
+++ b/src/core/lib/event_engine/event_engine.cc
@@ -11,11 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "absl/strings/str_cat.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/extensions/can_track_errors.h b/src/core/lib/event_engine/extensions/can_track_errors.h
index 8a6f9df046c..d3042acbb2a 100644
--- a/src/core/lib/event_engine/extensions/can_track_errors.h
+++ b/src/core/lib/event_engine/extensions/can_track_errors.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CAN_TRACK_ERRORS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/extensions/chaotic_good_extension.h b/src/core/lib/event_engine/extensions/chaotic_good_extension.h
index 9610f4ed720..e787712e266 100644
--- a/src/core/lib/event_engine/extensions/chaotic_good_extension.h
+++ b/src/core/lib/event_engine/extensions/chaotic_good_extension.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_CHAOTIC_GOOD_EXTENSION_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/extensions/supports_fd.h b/src/core/lib/event_engine/extensions/supports_fd.h
index 30f0d2ad0e6..c7a1bfdcd4f 100644
--- a/src/core/lib/event_engine/extensions/supports_fd.h
+++ b/src/core/lib/event_engine/extensions/supports_fd.h
@@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_EXTENSIONS_SUPPORTS_FD_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include "absl/functional/any_invocable.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/extensions/tcp_trace.h b/src/core/lib/event_engine/extensions/tcp_trace.h
index e5d66a45860..4e5efa712f7 100644
--- a/src/core/lib/event_engine/extensions/tcp_trace.h
+++ b/src/core/lib/event_engine/extensions/tcp_trace.h
@@ -18,7 +18,6 @@
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/telemetry/tcp_tracer.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/forkable.cc b/src/core/lib/event_engine/forkable.cc
index 0034cbbd92e..e83c8105dee 100644
--- a/src/core/lib/event_engine/forkable.cc
+++ b/src/core/lib/event_engine/forkable.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/event_engine/forkable.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 #ifdef GRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK
 #include <pthread.h>
 #endif
diff --git a/src/core/lib/event_engine/forkable.h b/src/core/lib/event_engine/forkable.h
index 414947b7515..38a3637ecae 100644
--- a/src/core/lib/event_engine/forkable.h
+++ b/src/core/lib/event_engine/forkable.h
@@ -14,11 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_FORKABLE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/grpc_polled_fd.h b/src/core/lib/event_engine/grpc_polled_fd.h
index d1e6dc3b20c..65ce8cbb176 100644
--- a/src/core/lib/event_engine/grpc_polled_fd.h
+++ b/src/core/lib/event_engine/grpc_polled_fd.h
@@ -15,18 +15,17 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_GRPC_POLLED_FD_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #if GRPC_ARES == 1
 
 #include <ares.h>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
 #include "src/core/util/sync.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/handle_containers.h b/src/core/lib/event_engine/handle_containers.h
index 2a4cd766f18..5772de7476d 100644
--- a/src/core/lib/event_engine/handle_containers.h
+++ b/src/core/lib/event_engine/handle_containers.h
@@ -14,6 +14,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_HANDLE_CONTAINERS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -22,9 +24,6 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/hash/hash.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/memory_allocator_factory.h b/src/core/lib/event_engine/memory_allocator_factory.h
index 88e61908ef3..8283c415970 100644
--- a/src/core/lib/event_engine/memory_allocator_factory.h
+++ b/src/core/lib/event_engine/memory_allocator_factory.h
@@ -13,14 +13,13 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_MEMORY_ALLOCATOR_FACTORY_H
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/poller.h b/src/core/lib/event_engine/poller.h
index 26333e798fa..550ce2b24f2 100644
--- a/src/core/lib/event_engine/poller.h
+++ b/src/core/lib/event_engine/poller.h
@@ -14,11 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POLLER_H
 
-#include "absl/functional/function_ref.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/function_ref.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/.clang-format b/src/core/lib/event_engine/posix_engine/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/lib/event_engine/posix_engine/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
index f59c6616bd9..e8abcaf471d 100644
--- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
+++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -23,12 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h
index 42c61446659..de850dc671f 100644
--- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h
+++ b/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h
@@ -14,6 +14,9 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_EPOLL1_LINUX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_EPOLL1_LINUX_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <list>
 #include <memory>
 #include <string>
@@ -22,10 +25,6 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
index c62c9e1a8e2..9bc6ba27553 100644
--- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
+++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/lib/event_engine/posix_engine/ev_poll_posix.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -27,13 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
@@ -43,13 +41,12 @@
 #ifdef GRPC_POSIX_SOCKET_EV_POLL
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h"
diff --git a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h
index d3e139eb0c8..d296eb58e50 100644
--- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.h
+++ b/src/core/lib/event_engine/posix_engine/ev_poll_posix.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_POLL_POSIX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EV_POLL_POSIX_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
diff --git a/src/core/lib/event_engine/posix_engine/event_poller.h b/src/core/lib/event_engine/posix_engine/event_poller.h
index 49cf7769364..3553ae6ca3f 100644
--- a/src/core/lib/event_engine/posix_engine/event_poller.h
+++ b/src/core/lib/event_engine/posix_engine/event_poller.h
@@ -14,15 +14,14 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
index 7f11bbb05a0..7d22bcaf503 100644
--- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
+++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h"
diff --git a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h
index f1ec8c39d9e..bfde1904d9c 100644
--- a/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h
+++ b/src/core/lib/event_engine/posix_engine/event_poller_posix_default.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_POSIX_DEFAULT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_EVENT_POLLER_POSIX_DEFAULT_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
index 7c9f8a5f742..0dba5c5d11b 100644
--- a/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
+++ b/src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_GRPC_POLLED_FD_POSIX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_GRPC_POLLED_FD_POSIX_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
 
@@ -27,6 +27,7 @@
 
 // IWYU pragma: no_include <ares_build.h>
 
+#include <ares.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -36,12 +37,9 @@
 #include <unordered_set>
 #include <utility>
 
-#include <ares.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc
index dd4d3711f9d..878b5ba4022 100644
--- a/src/core/lib/event_engine/posix_engine/internal_errqueue.cc
+++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
diff --git a/src/core/lib/event_engine/posix_engine/internal_errqueue.h b/src/core/lib/event_engine/posix_engine/internal_errqueue.h
index c779af8106d..e2c1460d050 100644
--- a/src/core/lib/event_engine/posix_engine/internal_errqueue.h
+++ b/src/core/lib/event_engine/posix_engine/internal_errqueue.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_INTERNAL_ERRQUEUE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_INTERNAL_ERRQUEUE_H
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/lib/iomgr/port.h"
 
diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.cc b/src/core/lib/event_engine/posix_engine/lockfree_event.cc
index e0cb157b922..6a904cd36db 100644
--- a/src/core/lib/event_engine/posix_engine/lockfree_event.cc
+++ b/src/core/lib/event_engine/posix_engine/lockfree_event.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/posix_engine/lockfree_event.h"
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/event_engine/posix_engine/lockfree_event.h b/src/core/lib/event_engine/posix_engine/lockfree_event.h
index a9c2635cc91..fb05ae450cb 100644
--- a/src/core/lib/event_engine/posix_engine/lockfree_event.h
+++ b/src/core/lib/event_engine/posix_engine/lockfree_event.h
@@ -14,13 +14,12 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_LOCKFREE_EVENT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_LOCKFREE_EVENT_H
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/posix_engine_closure.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
index 7d4c7a0ac7b..44f23efb71e 100644
--- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
+++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
@@ -32,7 +32,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
index 693a70fbb43..138f89ac73e 100644
--- a/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
+++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
index bf6a78bb23c..ab1e61fbf65 100644
--- a/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.cc
@@ -14,6 +14,11 @@
 #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
 
 #include <errno.h>
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <limits.h>
 
@@ -32,13 +37,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_endpoint.h b/src/core/lib/event_engine/posix_engine/posix_endpoint.h
index 81ec03c7f0f..98d0e169c8a 100644
--- a/src/core/lib/event_engine/posix_engine/posix_endpoint.h
+++ b/src/core/lib/event_engine/posix_engine/posix_endpoint.h
@@ -19,6 +19,11 @@
 
 // IWYU pragma: no_include <bits/types/struct_iovec.h>
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/alloc.h>
+
 #include <atomic>
 #include <cstdint>
 #include <memory>
@@ -33,12 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc
index d0683677795..f2275975b0d 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc
@@ -13,6 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -30,13 +36,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/ares_resolver.h"
 #include "src/core/lib/event_engine/forkable.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h
index f2483d11653..82be0bdd0e5 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.h
@@ -13,6 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_H
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 #include <memory>
@@ -27,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_closure.h b/src/core/lib/event_engine/posix_engine/posix_engine_closure.h
index 084b096c14a..46d06f9c024 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_closure.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -14,14 +14,14 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_CLOSURE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_CLOSURE_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
index d8b40ab2f71..ce95139e6e8 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -20,7 +20,9 @@
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 
-#include <errno.h>       // IWYU pragma: keep
+#include <errno.h>  // IWYU pragma: keep
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
 #include <sys/socket.h>  // IWYU pragma: keep
 #include <unistd.h>      // IWYU pragma: keep
 
@@ -36,10 +38,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h
index 40c43de8c12..1ddbe1b3fb9 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener.h
@@ -14,6 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <atomic>
@@ -26,13 +31,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
index b3532e2d860..f8db2f28df9 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,10 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_replace.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h
index e5a9684545a..2fe3f68161c 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h
@@ -14,11 +14,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_POSIX_ENGINE_LISTENER_UTILS_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
index fad1a7f6730..2631b9926ef 100644
--- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
+++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
@@ -15,18 +15,16 @@
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 
 #include <errno.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 
 #include "absl/cleanup/cleanup.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 #include "src/core/util/time.h"
@@ -51,7 +49,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/util/status_helper.h"
 #include "src/core/util/strerror.h"
diff --git a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
index 07bd3308d1d..5a11675cbec 100644
--- a/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
+++ b/src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
@@ -15,6 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TCP_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TCP_SOCKET_UTILS_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 #include <utility>
@@ -22,13 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/src/core/lib/event_engine/posix_engine/timer.cc b/src/core/lib/event_engine/posix_engine/timer.cc
index 8e77e251bcc..4f4c303721d 100644
--- a/src/core/lib/event_engine/posix_engine/timer.cc
+++ b/src/core/lib/event_engine/posix_engine/timer.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 #include <limits>
 #include <utility>
 
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/event_engine/posix_engine/timer.h b/src/core/lib/event_engine/posix_engine/timer.h
index 54f753b91cf..7528ca89c1e 100644
--- a/src/core/lib/event_engine/posix_engine/timer.h
+++ b/src/core/lib/event_engine/posix_engine/timer.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -28,10 +30,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/event_engine/posix_engine/timer_heap.cc b/src/core/lib/event_engine/posix_engine/timer_heap.cc
index c3e560ba5cc..85fbdb9e01d 100644
--- a/src/core/lib/event_engine/posix_engine/timer_heap.cc
+++ b/src/core/lib/event_engine/posix_engine/timer_heap.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_heap.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/timer_heap.h b/src/core/lib/event_engine/posix_engine/timer_heap.h
index a13bc206cba..b59eb9b127f 100644
--- a/src/core/lib/event_engine/posix_engine/timer_heap.h
+++ b/src/core/lib/event_engine/posix_engine/timer_heap.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_HEAP_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_HEAP_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.cc b/src/core/lib/event_engine/posix_engine/timer_manager.cc
index 8a0373cf86b..4b2097e8b81 100644
--- a/src/core/lib/event_engine/posix_engine/timer_manager.cc
+++ b/src/core/lib/event_engine/posix_engine/timer_manager.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <memory>
 #include <utility>
 
@@ -25,10 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 
 static thread_local bool g_timer_thread;
diff --git a/src/core/lib/event_engine/posix_engine/timer_manager.h b/src/core/lib/event_engine/posix_engine/timer_manager.h
index 3650a06dfce..c7616db7c62 100644
--- a/src/core/lib/event_engine/posix_engine/timer_manager.h
+++ b/src/core/lib/event_engine/posix_engine/timer_manager.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_MANAGER_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TIMER_MANAGER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
index d908ca76943..2bc411b9d6e 100644
--- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
+++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23,10 +25,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h
index 1df29a14243..bd77ea81139 100644
--- a/src/core/lib/event_engine/posix_engine/traced_buffer_list.h
+++ b/src/core/lib/event_engine/posix_engine/traced_buffer_list.h
@@ -15,15 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TRACED_BUFFER_LIST_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_TRACED_BUFFER_LIST_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/posix_engine/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
index d6efbd26671..e23df12cdfa 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h
index 6ab9a6eaeb4..62d5c658240 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_EVENTFD_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_EVENTFD_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
index 9f2a0959df3..9aa1ba317c5 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
 
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
index 7676d6cf57b..9884363907c 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_PIPE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_PIPE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
index 119dab7ecfb..2e7f1574280 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
@@ -42,10 +42,10 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_H
 
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
index 35768988b65..71caee017bd 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
@@ -11,13 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h"
diff --git a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
index 40e9381576a..51f766fe760 100644
--- a/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
+++ b/src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
@@ -14,12 +14,12 @@
 
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_DEFAULT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_WAKEUP_FD_POSIX_DEFAULT_H
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/statusor.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/query_extensions.h b/src/core/lib/event_engine/query_extensions.h
index 2b39214e635..a9c7e7b8fff 100644
--- a/src/core/lib/event_engine/query_extensions.h
+++ b/src/core/lib/event_engine/query_extensions.h
@@ -14,11 +14,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_QUERY_EXTENSIONS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
index 107ba10f75b..3de70e7cd38 100644
--- a/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
+++ b/src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
@@ -15,13 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_REF_COUNTED_DNS_RESOLVER_INTERFACE_H
 
-#include <stdint.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/util/orphanable.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/resolved_address.cc b/src/core/lib/event_engine/resolved_address.cc
index 95c37586ae2..1a41663bedd 100644
--- a/src/core/lib/event_engine/resolved_address.cc
+++ b/src/core/lib/event_engine/resolved_address.cc
@@ -14,13 +14,11 @@
 
 #include "src/core/lib/iomgr/resolved_address.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
 
 // IWYU pragma: no_include <sys/socket.h>
diff --git a/src/core/lib/event_engine/slice.cc b/src/core/lib/event_engine/slice.cc
index 7d4a6c4a051..ea6994631ac 100644
--- a/src/core/lib/event_engine/slice.cc
+++ b/src/core/lib/event_engine/slice.cc
@@ -14,17 +14,15 @@
 
 #include "src/core/lib/slice/slice.h"
 
+#include <grpc/event_engine/slice.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/slice.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 
diff --git a/src/core/lib/event_engine/slice_buffer.cc b/src/core/lib/event_engine/slice_buffer.cc
index 4a1aa804837..5b8ad807ad7 100644
--- a/src/core/lib/event_engine/slice_buffer.cc
+++ b/src/core/lib/event_engine/slice_buffer.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <stddef.h>
-
 #include <grpc/event_engine/slice.h>
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/core/lib/event_engine/tcp_socket_utils.cc b/src/core/lib/event_engine/tcp_socket_utils.cc
index 1353249817d..d4ef7a8bb48 100644
--- a/src/core/lib/event_engine/tcp_socket_utils.cc
+++ b/src/core/lib/event_engine/tcp_socket_utils.cc
@@ -58,7 +58,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/status_helper.h"
diff --git a/src/core/lib/event_engine/tcp_socket_utils.h b/src/core/lib/event_engine/tcp_socket_utils.h
index d048a124b06..c8f25fe45fb 100644
--- a/src/core/lib/event_engine/tcp_socket_utils.h
+++ b/src/core/lib/event_engine/tcp_socket_utils.h
@@ -14,14 +14,14 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TCP_SOCKET_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/thread_pool/thread_count.cc b/src/core/lib/event_engine/thread_pool/thread_count.cc
index faeffe1f896..c2010a2a448 100644
--- a/src/core/lib/event_engine/thread_pool/thread_count.cc
+++ b/src/core/lib/event_engine/thread_pool/thread_count.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/thread_pool/thread_count.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <cstddef>
@@ -22,9 +23,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/thread_pool/thread_count.h b/src/core/lib/event_engine/thread_pool/thread_count.h
index 7bca370e9e1..cbd10fcfd71 100644
--- a/src/core/lib/event_engine/thread_pool/thread_count.h
+++ b/src/core/lib/event_engine/thread_pool/thread_count.h
@@ -14,6 +14,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_COUNT_H
 
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
@@ -22,10 +25,6 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/event_engine/thread_pool/thread_pool.h b/src/core/lib/event_engine/thread_pool/thread_pool.h
index 2590d891a30..e4648d1dbd3 100644
--- a/src/core/lib/event_engine/thread_pool/thread_pool.h
+++ b/src/core/lib/event_engine/thread_pool/thread_pool.h
@@ -13,15 +13,13 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_THREAD_POOL_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
index bea6d8d526c..e3a3799b6a4 100644
--- a/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
+++ b/src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
@@ -11,12 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/forkable.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
index 852cf0f3915..a8f35bb1cfd 100644
--- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
+++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
@@ -17,6 +17,8 @@
 //
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/thd_id.h>
 #include <inttypes.h>
 
 #include <atomic>
@@ -31,10 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_local.h"
diff --git a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h
index 69beaa7cddd..a0c79f64da0 100644
--- a/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h
+++ b/src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h
@@ -18,6 +18,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREAD_POOL_WORK_STEALING_THREAD_POOL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/thd_id.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,11 +30,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/event_engine/thread_pool/thread_count.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
index 5475f2e45a0..94b53e9081b 100644
--- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
+++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <type_traits>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
diff --git a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
index 8b87d90a757..02f90c7a771 100644
--- a/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
+++ b/src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_THREADY_EVENT_ENGINE_THREADY_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
@@ -23,11 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/time_util.cc b/src/core/lib/event_engine/time_util.cc
index d7b663581d1..ab542b1e258 100644
--- a/src/core/lib/event_engine/time_util.cc
+++ b/src/core/lib/event_engine/time_util.cc
@@ -13,11 +13,11 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/time_util.h"
 
-#include <chrono>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <chrono>
+
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/event_engine/time_util.h b/src/core/lib/event_engine/time_util.h
index 813b6cda8f8..14ec99ab5d1 100644
--- a/src/core/lib/event_engine/time_util.h
+++ b/src/core/lib/event_engine/time_util.h
@@ -14,10 +14,9 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_TIME_UTIL_H
 
-#include <stddef.h>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 namespace grpc_event_engine {
 namespace experimental {
diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc
index d0d1b436c5d..f2a202315ce 100644
--- a/src/core/lib/event_engine/utils.cc
+++ b/src/core/lib/event_engine/utils.cc
@@ -13,15 +13,13 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/utils.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h
index 5edfcd890f0..45675ee8d88 100644
--- a/src/core/lib/event_engine/utils.h
+++ b/src/core/lib/event_engine/utils.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/event_engine/windows/.clang-format b/src/core/lib/event_engine/windows/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/lib/event_engine/windows/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
index 3723b3463ed..3bfd15537e6 100644
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
@@ -18,17 +18,14 @@
 
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
-#include <winsock2.h>
-
 #include <ares.h>
+#include <grpc/support/log_windows.h>
+#include <winsock2.h>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/ares_resolver.h"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
diff --git a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
index e16c8e80e9e..f0efeaccfcc 100644
--- a/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
+++ b/src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
@@ -21,15 +21,13 @@
 
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
-#include <memory>
-
 #include <ares.h>
+#include <grpc/event_engine/event_engine.h>
+
+#include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/grpc_polled_fd.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/src/core/lib/event_engine/windows/iocp.cc b/src/core/lib/event_engine/windows/iocp.cc
index 74d875ba2ab..b3458b3e05a 100644
--- a/src/core/lib/event_engine/windows/iocp.cc
+++ b/src/core/lib/event_engine/windows/iocp.cc
@@ -15,14 +15,13 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+
 #include <chrono>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/src/core/lib/event_engine/windows/iocp.h b/src/core/lib/event_engine/windows/iocp.h
index 9c972ed0f92..812f773b85c 100644
--- a/src/core/lib/event_engine/windows/iocp.h
+++ b/src/core/lib/event_engine/windows/iocp.h
@@ -18,10 +18,9 @@
 
 #ifdef GPR_WINDOWS
 
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/win_socket.h"
diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
index d8114497b11..6a1caaf9116 100644
--- a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
+++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
@@ -14,6 +14,7 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
+#include <grpc/event_engine/event_engine.h>
 #include <inttypes.h>
 #include <string.h>
 #include <sys/types.h>
@@ -22,9 +23,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/host_port.h"
diff --git a/src/core/lib/event_engine/windows/win_socket.cc b/src/core/lib/event_engine/windows/win_socket.cc
index 79fc2bec4fe..482d4bb06f7 100644
--- a/src/core/lib/event_engine/windows/win_socket.cc
+++ b/src/core/lib/event_engine/windows/win_socket.cc
@@ -14,12 +14,11 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/log_windows.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/win_socket.h"
diff --git a/src/core/lib/event_engine/windows/win_socket.h b/src/core/lib/event_engine/windows/win_socket.h
index 4256179c070..6300279efe6 100644
--- a/src/core/lib/event_engine/windows/win_socket.h
+++ b/src/core/lib/event_engine/windows/win_socket.h
@@ -18,11 +18,10 @@
 
 #ifdef GPR_WINDOWS
 
-#include "absl/base/thread_annotations.h"
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/event_engine/windows/windows_endpoint.cc b/src/core/lib/event_engine/windows/windows_endpoint.cc
index ec4118c7fd2..3b16c060de6 100644
--- a/src/core/lib/event_engine/windows/windows_endpoint.cc
+++ b/src/core/lib/event_engine/windows/windows_endpoint.cc
@@ -15,16 +15,15 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/log_windows.h>
+
 #include "absl/cleanup/cleanup.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/windows_endpoint.h"
diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc
index 31e2eb03569..6a1fb634fe5 100644
--- a/src/core/lib/event_engine/windows/windows_engine.cc
+++ b/src/core/lib/event_engine/windows/windows_engine.cc
@@ -15,6 +15,12 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/cpu.h>
+
 #include <memory>
 #include <ostream>
 
@@ -23,13 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/cpu.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/handle_containers.h"
diff --git a/src/core/lib/event_engine/windows/windows_engine.h b/src/core/lib/event_engine/windows/windows_engine.h
index 98ca81e1a52..c9a597b5713 100644
--- a/src/core/lib/event_engine/windows/windows_engine.h
+++ b/src/core/lib/event_engine/windows/windows_engine.h
@@ -20,17 +20,16 @@
 
 #ifdef GPR_WINDOWS
 
-#include <memory>
-
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/event_engine/slice_buffer.h>
 
+#include <memory>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/event_engine/ares_resolver.h"
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
diff --git a/src/core/lib/event_engine/windows/windows_listener.cc b/src/core/lib/event_engine/windows/windows_listener.cc
index 2bba1a6e818..63b973cf213 100644
--- a/src/core/lib/event_engine/windows/windows_listener.cc
+++ b/src/core/lib/event_engine/windows/windows_listener.cc
@@ -19,7 +19,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
 #include "src/core/lib/event_engine/windows/win_socket.h"
diff --git a/src/core/lib/event_engine/windows/windows_listener.h b/src/core/lib/event_engine/windows/windows_listener.h
index 8e0a5bd0f95..4dd254d7d10 100644
--- a/src/core/lib/event_engine/windows/windows_listener.h
+++ b/src/core/lib/event_engine/windows/windows_listener.h
@@ -18,14 +18,13 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <list>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.cc b/src/core/lib/event_engine/work_queue/basic_work_queue.cc
index 40bfcf7cd5d..629debf2bc8 100644
--- a/src/core/lib/event_engine/work_queue/basic_work_queue.cc
+++ b/src/core/lib/event_engine/work_queue/basic_work_queue.cc
@@ -13,10 +13,10 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/event_engine/work_queue/basic_work_queue.h b/src/core/lib/event_engine/work_queue/basic_work_queue.h
index 93ac366831e..20da2977742 100644
--- a/src/core/lib/event_engine/work_queue/basic_work_queue.h
+++ b/src/core/lib/event_engine/work_queue/basic_work_queue.h
@@ -13,16 +13,14 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_BASIC_WORK_QUEUE_H
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <deque>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/work_queue/work_queue.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/event_engine/work_queue/work_queue.h b/src/core/lib/event_engine/work_queue/work_queue.h
index 73c6a74ab21..393a1bce6a0 100644
--- a/src/core/lib/event_engine/work_queue/work_queue.h
+++ b/src/core/lib/event_engine/work_queue/work_queue.h
@@ -14,13 +14,12 @@
 #ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H
 #define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WORK_QUEUE_WORK_QUEUE_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/functional/any_invocable.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/src/core/lib/experiments/config.cc b/src/core/lib/experiments/config.cc
index cab35e0f04a..f2ec5d1a0db 100644
--- a/src/core/lib/experiments/config.cc
+++ b/src/core/lib/experiments/config.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/experiments/config.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -30,9 +31,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/util/crash.h"  // IWYU pragma: keep
diff --git a/src/core/lib/experiments/config.h b/src/core/lib/experiments/config.h
index 921875b99bb..e74f7c6b716 100644
--- a/src/core/lib/experiments/config.h
+++ b/src/core/lib/experiments/config.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H
 #define GRPC_SRC_CORE_LIB_EXPERIMENTS_CONFIG_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -23,8 +24,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 // #define GRPC_EXPERIMENTS_ARE_FINAL
 
 namespace grpc_core {
diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc
index 91bfc45a021..1cc2cbb4e9c 100644
--- a/src/core/lib/iomgr/buffer_list.cc
+++ b/src/core/lib/iomgr/buffer_list.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/iomgr/buffer_list.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/iomgr/buffer_list.h b/src/core/lib/iomgr/buffer_list.h
index 6805c53c08d..47d390354a8 100644
--- a/src/core/lib/iomgr/buffer_list.h
+++ b/src/core/lib/iomgr/buffer_list.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
 #define GRPC_SRC_CORE_LIB_IOMGR_BUFFER_LIST_H
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc
index e20cc0a0986..8459f415157 100644
--- a/src/core/lib/iomgr/call_combiner.cc
+++ b/src/core/lib/iomgr/call_combiner.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/iomgr/call_combiner.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/call_combiner.h b/src/core/lib/iomgr/call_combiner.h
index 23488f51cfc..8e4b7189798 100644
--- a/src/core/lib/iomgr/call_combiner.h
+++ b/src/core/lib/iomgr/call_combiner.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_CALL_COMBINER_H
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/container/inlined_vector.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/dynamic_annotations.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/cfstream_handle.cc b/src/core/lib/iomgr/cfstream_handle.cc
index e70393f6abd..0b64b87f3dd 100644
--- a/src/core/lib/iomgr/cfstream_handle.cc
+++ b/src/core/lib/iomgr/cfstream_handle.cc
@@ -23,13 +23,11 @@
 
 #ifdef GRPC_CFSTREAM
 #import <CoreFoundation/CoreFoundation.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/debug/trace.h"
 #import "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/iomgr/closure.cc b/src/core/lib/iomgr/closure.cc
index 12ff26a9156..bbc81f8445e 100644
--- a/src/core/lib/iomgr/closure.cc
+++ b/src/core/lib/iomgr/closure.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/iomgr/closure.h"
 
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_format.h"
+
 std::string grpc_closure::DebugString() const {
 #ifdef NDEBUG
   return absl::StrFormat("%p", this);
diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h
index cb08c23e7c7..cf01653e9d8 100644
--- a/src/core/lib/iomgr/closure.h
+++ b/src/core/lib/iomgr/closure.h
@@ -20,14 +20,12 @@
 #define GRPC_SRC_CORE_LIB_IOMGR_CLOSURE_H
 
 #include <assert.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdbool.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc
index 31f7b204af9..81f33c70a2b 100644
--- a/src/core/lib/iomgr/combiner.cc
+++ b/src/core/lib/iomgr/combiner.cc
@@ -19,15 +19,13 @@
 #include "src/core/lib/iomgr/combiner.h"
 
 #include <assert.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/combiner.h b/src/core/lib/iomgr/combiner.h
index af15e83af29..f7fd6bd6955 100644
--- a/src/core/lib/iomgr/combiner.h
+++ b/src/core/lib/iomgr/combiner.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_COMBINER_H
 
-#include <stddef.h>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/endpoint.h b/src/core/lib/iomgr/endpoint.h
index c4b70abe4f3..9825d21a6b5 100644
--- a/src/core/lib/iomgr/endpoint.h
+++ b/src/core/lib/iomgr/endpoint.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H
 #define GRPC_SRC_CORE_LIB_IOMGR_ENDPOINT_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 
diff --git a/src/core/lib/iomgr/endpoint_cfstream.cc b/src/core/lib/iomgr/endpoint_cfstream.cc
index c542c6ae6bc..3177567e948 100644
--- a/src/core/lib/iomgr/endpoint_cfstream.cc
+++ b/src/core/lib/iomgr/endpoint_cfstream.cc
@@ -23,14 +23,12 @@
 #ifdef GRPC_CFSTREAM_ENDPOINT
 
 #import <CoreFoundation/CoreFoundation.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/cfstream_handle.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/iomgr/endpoint_pair_posix.cc b/src/core/lib/iomgr/endpoint_pair_posix.cc
index 85fb3849f29..04c574560c0 100644
--- a/src/core/lib/iomgr/endpoint_pair_posix.cc
+++ b/src/core/lib/iomgr/endpoint_pair_posix.cc
@@ -24,6 +24,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -32,9 +33,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
diff --git a/src/core/lib/iomgr/endpoint_pair_windows.cc b/src/core/lib/iomgr/endpoint_pair_windows.cc
index f8a746624e6..f30f691323d 100644
--- a/src/core/lib/iomgr/endpoint_pair_windows.cc
+++ b/src/core/lib/iomgr/endpoint_pair_windows.cc
@@ -27,7 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc
index d637ab6d20c..90f535bcf5e 100644
--- a/src/core/lib/iomgr/error.cc
+++ b/src/core/lib/iomgr/error.cc
@@ -17,6 +17,10 @@
 //
 #include "src/core/lib/iomgr/error.h"
 
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -24,12 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 
 #ifdef GPR_WINDOWS
diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h
index e1fb98107c1..0171c504811 100644
--- a/src/core/lib/iomgr/error.h
+++ b/src/core/lib/iomgr/error.h
@@ -19,17 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_ERROR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_ERROR_H
 
-#include <inttypes.h>
-#include <stdbool.h>
-
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <stdbool.h>
 
+#include "absl/log/check.h"
+#include "absl/status/status.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/error_cfstream.cc b/src/core/lib/iomgr/error_cfstream.cc
index 49f5b0aaddf..b9f7cdf1992 100644
--- a/src/core/lib/iomgr/error_cfstream.cc
+++ b/src/core/lib/iomgr/error_cfstream.cc
@@ -20,13 +20,11 @@
 
 #ifdef GRPC_CFSTREAM
 #include <CoreFoundation/CoreFoundation.h>
+#include <grpc/support/alloc.h>
 
 #include <string>
 
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/error.h"
 
 #define MAX_ERROR_DESCRIPTION 256
diff --git a/src/core/lib/iomgr/ev_apple.cc b/src/core/lib/iomgr/ev_apple.cc
index 73ded9294d7..e20f05e5185 100644
--- a/src/core/lib/iomgr/ev_apple.cc
+++ b/src/core/lib/iomgr/ev_apple.cc
@@ -34,7 +34,6 @@
 #include <list>
 
 #include "absl/time/time.h"
-
 #include "src/core/lib/iomgr/ev_apple.h"
 #include "src/core/util/thd.h"
 #include "src/core/util/time_util.h"
diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc
index ff347ac69d6..a290c3d1bdc 100644
--- a/src/core/lib/iomgr/ev_epoll1_linux.cc
+++ b/src/core/lib/iomgr/ev_epoll1_linux.cc
@@ -27,6 +27,8 @@
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
 #include <limits.h>
 #include <poll.h>
 #include <pthread.h>
@@ -43,10 +45,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-
 #include "src/core/lib/iomgr/block_annotate.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
 #include "src/core/lib/iomgr/ev_posix.h"
diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc
index 9e955d8c094..32d42c36e27 100644
--- a/src/core/lib/iomgr/ev_poll_posix.cc
+++ b/src/core/lib/iomgr/ev_poll_posix.cc
@@ -25,6 +25,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <poll.h>
 #include <string.h>
@@ -37,9 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/block_annotate.h"
 #include "src/core/lib/iomgr/ev_poll_posix.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc
index e195c940d87..055ca6efb5e 100644
--- a/src/core/lib/iomgr/ev_posix.cc
+++ b/src/core/lib/iomgr/ev_posix.cc
@@ -23,15 +23,13 @@
 
 #ifdef GRPC_POSIX_SOCKET_EV
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/ev_epoll1_linux.h"
diff --git a/src/core/lib/iomgr/ev_posix.h b/src/core/lib/iomgr/ev_posix.h
index 8573f0568bc..1e40d81f020 100644
--- a/src/core/lib/iomgr/ev_posix.h
+++ b/src/core/lib/iomgr/ev_posix.h
@@ -23,9 +23,8 @@
 
 #ifdef GRPC_POSIX_SOCKET_EV
 
-#include <poll.h>
-
 #include <grpc/support/port_platform.h>
+#include <poll.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/event_engine_shims/closure.cc b/src/core/lib/iomgr/event_engine_shims/closure.cc
index 8a362210b80..921401941cf 100644
--- a/src/core/lib/iomgr/event_engine_shims/closure.cc
+++ b/src/core/lib/iomgr/event_engine_shims/closure.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/closure.h"
 
-#include "absl/functional/any_invocable.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/core/lib/iomgr/event_engine_shims/closure.h b/src/core/lib/iomgr/event_engine_shims/closure.h
index 87b4e60bee1..2272f68fed7 100644
--- a/src/core/lib/iomgr/event_engine_shims/closure.h
+++ b/src/core/lib/iomgr/event_engine_shims/closure.h
@@ -14,11 +14,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_CLOSURE_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 
diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc
index 28b1ef42bf1..5fec956179e 100644
--- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc
+++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc
@@ -13,6 +13,13 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/codegen/slice.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <atomic>
 #include <memory>
 #include <utility>
@@ -23,14 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/codegen/slice.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/extensions/can_track_errors.h"
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.h b/src/core/lib/iomgr/event_engine_shims/endpoint.h
index 2ff27081503..5e59157aa68 100644
--- a/src/core/lib/iomgr/event_engine_shims/endpoint.h
+++ b/src/core/lib/iomgr/event_engine_shims/endpoint.h
@@ -13,11 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_ENDPOINT_H
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/iomgr/endpoint.h"
 
 namespace grpc_event_engine {
diff --git a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc
index 2880415e192..16d27f005a2 100644
--- a/src/core/lib/iomgr/event_engine_shims/tcp_client.cc
+++ b/src/core/lib/iomgr/event_engine_shims/tcp_client.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h"
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc
index 6bb16390008..23d4248eaa9 100644
--- a/src/core/lib/iomgr/exec_ctx.cc
+++ b/src/core/lib/iomgr/exec_ctx.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h
index 0bda1d9af88..2b608ca9a4d 100644
--- a/src/core/lib/iomgr/exec_ctx.h
+++ b/src/core/lib/iomgr/exec_ctx.h
@@ -19,22 +19,21 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 
-#include <limits>
-
 #include <grpc/support/port_platform.h>
 
+#include <limits>
+
 #if __APPLE__
 // Provides TARGET_OS_IPHONE
 #include <TargetConditionals.h>
 #endif
 
-#include "absl/log/check.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc
index 9c427b6fd12..b9ff3a5f78f 100644
--- a/src/core/lib/iomgr/executor.cc
+++ b/src/core/lib/iomgr/executor.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/iomgr/executor.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/debug/trace_impl.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/fork_posix.cc b/src/core/lib/iomgr/fork_posix.cc
index 37059aaa815..0d784ea53cc 100644
--- a/src/core/lib/iomgr/fork_posix.cc
+++ b/src/core/lib/iomgr/fork_posix.cc
@@ -26,13 +26,11 @@
 #include <pthread.h>
 #endif
 
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/src/core/lib/iomgr/fork_windows.cc b/src/core/lib/iomgr/fork_windows.cc
index 84d0609e2a0..baf9e212469 100644
--- a/src/core/lib/iomgr/fork_windows.cc
+++ b/src/core/lib/iomgr/fork_windows.cc
@@ -22,10 +22,10 @@
 
 #ifndef GRPC_POSIX_FORK
 
-#include "absl/log/log.h"
-
 #include <grpc/fork.h>
 
+#include "absl/log/log.h"
+
 //
 // NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK
 //       AROUND VERY SPECIFIC USE CASES.
diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc
index 65199cd8e35..d5386498a53 100644
--- a/src/core/lib/iomgr/internal_errqueue.cc
+++ b/src/core/lib/iomgr/internal_errqueue.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/lib/iomgr/internal_errqueue.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc
index 51eae975fbc..12b8cb31c63 100644
--- a/src/core/lib/iomgr/iocp_windows.cc
+++ b/src/core/lib/iomgr/iocp_windows.cc
@@ -22,16 +22,14 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
 #include <winsock2.h>
 
 #include <limits>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/socket_windows.h"
diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc
index a4fce10be34..39e0504d0d7 100644
--- a/src/core/lib/iomgr/iomgr.cc
+++ b/src/core/lib/iomgr/iomgr.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/iomgr/iomgr.h"
 
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/buffer_list.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/iomgr/iomgr.h b/src/core/lib/iomgr/iomgr.h
index 3c4a5987f19..280471fae87 100644
--- a/src/core/lib/iomgr/iomgr.h
+++ b/src/core/lib/iomgr/iomgr.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 
-#include <stdlib.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/iomgr_internal.cc b/src/core/lib/iomgr/iomgr_internal.cc
index 81c1b829247..f5bb42e53d5 100644
--- a/src/core/lib/iomgr/iomgr_internal.cc
+++ b/src/core/lib/iomgr/iomgr_internal.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/lib/iomgr/iomgr_internal.h"
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 static grpc_iomgr_platform_vtable* iomgr_platform_vtable = nullptr;
 
diff --git a/src/core/lib/iomgr/iomgr_internal.h b/src/core/lib/iomgr/iomgr_internal.h
index a3a8ceb178a..c0d34a9d0a5 100644
--- a/src/core/lib/iomgr/iomgr_internal.h
+++ b/src/core/lib/iomgr/iomgr_internal.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/lib/iomgr/iomgr_windows.cc b/src/core/lib/iomgr/iomgr_windows.cc
index fe1d24a3492..2d8716c54ee 100644
--- a/src/core/lib/iomgr/iomgr_windows.cc
+++ b/src/core/lib/iomgr/iomgr_windows.cc
@@ -23,7 +23,6 @@
 #ifdef GRPC_WINSOCK_SOCKET
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/src/core/lib/iomgr/lockfree_event.cc b/src/core/lib/iomgr/lockfree_event.cc
index 53700d13749..42023ef4615 100644
--- a/src/core/lib/iomgr/lockfree_event.cc
+++ b/src/core/lib/iomgr/lockfree_event.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/iomgr/lockfree_event.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc
index 918af4a7f65..8a5ad277f24 100644
--- a/src/core/lib/iomgr/polling_entity.cc
+++ b/src/core/lib/iomgr/polling_entity.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/iomgr/polling_entity.h"
 
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 
 grpc_polling_entity grpc_polling_entity_create_from_pollset_set(
diff --git a/src/core/lib/iomgr/pollset_set_windows.cc b/src/core/lib/iomgr/pollset_set_windows.cc
index 46dd8d20977..c40eccf95e4 100644
--- a/src/core/lib/iomgr/pollset_set_windows.cc
+++ b/src/core/lib/iomgr/pollset_set_windows.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/lib/iomgr/port.h"
 
diff --git a/src/core/lib/iomgr/resolve_address.cc b/src/core/lib/iomgr/resolve_address.cc
index a6130701fec..3a0d1b106e1 100644
--- a/src/core/lib/iomgr/resolve_address.cc
+++ b/src/core/lib/iomgr/resolve_address.cc
@@ -17,12 +17,11 @@
 //
 #include "src/core/lib/iomgr/resolve_address.h"
 
-#include "absl/strings/str_cat.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/src/core/lib/iomgr/resolve_address.h b/src/core/lib/iomgr/resolve_address.h
index c8c94b00c0b..5a8279ae9c4 100644
--- a/src/core/lib/iomgr/resolve_address.h
+++ b/src/core/lib/iomgr/resolve_address.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/resolve_address_impl.h b/src/core/lib/iomgr/resolve_address_impl.h
index a6e072dd919..4c3cbe0d92b 100644
--- a/src/core/lib/iomgr/resolve_address_impl.h
+++ b/src/core/lib/iomgr/resolve_address_impl.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/resolve_address_posix.cc b/src/core/lib/iomgr/resolve_address_posix.cc
index 0dd2e449575..fe1d4c99a93 100644
--- a/src/core/lib/iomgr/resolve_address_posix.cc
+++ b/src/core/lib/iomgr/resolve_address_posix.cc
@@ -21,12 +21,11 @@
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
 
-#include <string.h>
-#include <sys/types.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <string.h>
+#include <sys/types.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/block_annotate.h"
diff --git a/src/core/lib/iomgr/resolve_address_posix.h b/src/core/lib/iomgr/resolve_address_posix.h
index 15986358e80..cb37cbc9a75 100644
--- a/src/core/lib/iomgr/resolve_address_posix.h
+++ b/src/core/lib/iomgr/resolve_address_posix.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H
 
-#include <functional>
-
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/resolve_address_windows.cc b/src/core/lib/iomgr/resolve_address_windows.cc
index 9db5b689954..1dc7ee3d1fc 100644
--- a/src/core/lib/iomgr/resolve_address_windows.cc
+++ b/src/core/lib/iomgr/resolve_address_windows.cc
@@ -19,6 +19,10 @@
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_WINSOCK_SOCKET
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 #include <sys/types.h>
@@ -26,12 +30,6 @@
 #include <string>
 
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/block_annotate.h"
diff --git a/src/core/lib/iomgr/resolve_address_windows.h b/src/core/lib/iomgr/resolve_address_windows.h
index eea5c44111e..6d608efd2e8 100644
--- a/src/core/lib/iomgr/resolve_address_windows.h
+++ b/src/core/lib/iomgr/resolve_address_windows.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H
 
-#include <functional>
-
 #include <grpc/support/port_platform.h>
 
+#include <functional>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/resolved_address.h b/src/core/lib/iomgr/resolved_address.h
index e16f7fc27f9..c622bdb5126 100644
--- a/src/core/lib/iomgr/resolved_address.h
+++ b/src/core/lib/iomgr/resolved_address.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/port.h"
 
diff --git a/src/core/lib/iomgr/sockaddr_utils_posix.cc b/src/core/lib/iomgr/sockaddr_utils_posix.cc
index 8fc4d5a186e..a522df8aecd 100644
--- a/src/core/lib/iomgr/sockaddr_utils_posix.cc
+++ b/src/core/lib/iomgr/sockaddr_utils_posix.cc
@@ -30,6 +30,8 @@
 #else
 #include <netinet/tcp.h>
 #endif
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -38,10 +40,6 @@
 #include <string>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/iomgr/socket_mutator.h b/src/core/lib/iomgr/socket_mutator.h
index e919d3caaa4..9ce180b3452 100644
--- a/src/core/lib/iomgr/socket_mutator.h
+++ b/src/core/lib/iomgr/socket_mutator.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H
 
-#include <stdbool.h>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <stdbool.h>
 
 /// How is an fd to be used?
 typedef enum {
diff --git a/src/core/lib/iomgr/socket_utils.h b/src/core/lib/iomgr/socket_utils.h
index 75d3082677d..f6c4c27d6de 100644
--- a/src/core/lib/iomgr/socket_utils.h
+++ b/src/core/lib/iomgr/socket_utils.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 // TODO(juanlishen): The following functions might be simple enough to implement
 // ourselves, so that they don't cause any portability hassle.
diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc
index 49b1c349795..8b1af9db729 100644
--- a/src/core/lib/iomgr/socket_utils_common_posix.cc
+++ b/src/core/lib/iomgr/socket_utils_common_posix.cc
@@ -35,6 +35,9 @@
 #else
 #include <netinet/tcp.h>
 #endif
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -46,11 +49,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc
index ebd2d586069..aa356e591c8 100644
--- a/src/core/lib/iomgr/socket_utils_posix.cc
+++ b/src/core/lib/iomgr/socket_utils_posix.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKETUTILS
 #include <fcntl.h>
+#include <grpc/impl/grpc_types.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include <grpc/impl/grpc_types.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc
index 6ace1af6bc4..8ec4eaa1366 100644
--- a/src/core/lib/iomgr/socket_windows.cc
+++ b/src/core/lib/iomgr/socket_windows.cc
@@ -25,15 +25,13 @@
 #include <winsock2.h>
 
 // must be included after winsock2.h
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
 #include <mswsock.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/pollset.h"
diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h
index 418685a5d3d..3c272b72c6e 100644
--- a/src/core/lib/iomgr/socket_windows.h
+++ b/src/core/lib/iomgr/socket_windows.h
@@ -24,10 +24,9 @@
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_WINSOCK_SOCKET
-#include <winsock2.h>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
+#include <winsock2.h>
 
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/src/core/lib/iomgr/tcp_client_cfstream.cc b/src/core/lib/iomgr/tcp_client_cfstream.cc
index c091737b96c..141a9c76f52 100644
--- a/src/core/lib/iomgr/tcp_client_cfstream.cc
+++ b/src/core/lib/iomgr/tcp_client_cfstream.cc
@@ -24,15 +24,13 @@
 #ifdef GRPC_CFSTREAM_CLIENT
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <netinet/in.h>
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <netinet/in.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/iomgr/cfstream_handle.h"
diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc
index a66807cf111..9394ec75783 100644
--- a/src/core/lib/iomgr/tcp_client_posix.cc
+++ b/src/core/lib/iomgr/tcp_client_posix.cc
@@ -24,6 +24,8 @@
 #ifdef GRPC_POSIX_SOCKET_TCP_CLIENT
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <unistd.h>
@@ -32,10 +34,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
 #include "src/core/lib/event_engine/shim.h"
diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc
index c19e81d8131..5cc135d809d 100644
--- a/src/core/lib/iomgr/tcp_client_windows.cc
+++ b/src/core/lib/iomgr/tcp_client_windows.cc
@@ -16,21 +16,19 @@
 //
 //
 
-#include <inttypes.h>
-
 #include <grpc/support/port_platform.h>
+#include <inttypes.h>
 
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include "absl/log/check.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log_windows.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/iomgr/event_engine_shims/tcp_client.h"
diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc
index a53d983db33..1b45c36efff 100644
--- a/src/core/lib/iomgr/tcp_posix.cc
+++ b/src/core/lib/iomgr/tcp_posix.cc
@@ -16,21 +16,25 @@
 //
 //
 
+#include <grpc/impl/grpc_types.h>
+#include <grpc/support/port_platform.h>
+
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/grpc_types.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
 
 #include <errno.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -47,13 +51,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/core/lib/iomgr/tcp_server.h b/src/core/lib/iomgr/tcp_server.h
index 8b1feece209..5f5197bbc4f 100644
--- a/src/core/lib/iomgr/tcp_server.h
+++ b/src/core/lib/iomgr/tcp_server.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_H
 
-#include <vector>
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include <vector>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/src/core/lib/iomgr/tcp_server_posix.cc b/src/core/lib/iomgr/tcp_server_posix.cc
index fdd3d96c63e..357412fa9ee 100644
--- a/src/core/lib/iomgr/tcp_server_posix.cc
+++ b/src/core/lib/iomgr/tcp_server_posix.cc
@@ -16,11 +16,11 @@
 //
 //
 
-#include <utility>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 // FIXME: "posix" files shouldn't be depending on _GNU_SOURCE
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -32,6 +32,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/byte_buffer.h>
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -47,14 +53,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/memory_allocator_factory.h"
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix.h b/src/core/lib/iomgr/tcp_server_utils_posix.h
index fcf97da7926..a726c750279 100644
--- a/src/core/lib/iomgr/tcp_server_utils_posix.h
+++ b/src/core/lib/iomgr/tcp_server_utils_posix.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TCP_SERVER_UTILS_POSIX_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/container/flat_hash_map.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc
index 7ec14525002..638e3221614 100644
--- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc
+++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc
@@ -24,6 +24,8 @@
 #ifdef GRPC_POSIX_SOCKET_TCP_SERVER_UTILS_COMMON
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
@@ -34,10 +36,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
index 89c69d8beb2..2dad0bb1be4 100644
--- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
+++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
@@ -23,6 +23,7 @@
 #ifdef GRPC_HAVE_IFADDRS
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <ifaddrs.h>
 #include <stddef.h>
 #include <string.h>
@@ -33,9 +34,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc
index ed32fcb25b0..e5fcac64277 100644
--- a/src/core/lib/iomgr/tcp_server_windows.cc
+++ b/src/core/lib/iomgr/tcp_server_windows.cc
@@ -22,15 +22,6 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include <inttypes.h>
-#include <io.h>
-
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
@@ -39,7 +30,14 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <io.h>
+
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/memory_allocator_factory.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
diff --git a/src/core/lib/iomgr/tcp_windows.cc b/src/core/lib/iomgr/tcp_windows.cc
index 9574531c57d..e52ca28089f 100644
--- a/src/core/lib/iomgr/tcp_windows.cc
+++ b/src/core/lib/iomgr/tcp_windows.cc
@@ -22,15 +22,13 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
-#include <limits.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <limits.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h
index 299331f0320..5d84066f942 100644
--- a/src/core/lib/iomgr/timer.h
+++ b/src/core/lib/iomgr/timer.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_H
 
-#include <cstdint>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include <cstdint>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc
index 4d940942c47..3e5f604603a 100644
--- a/src/core/lib/iomgr/timer_generic.cc
+++ b/src/core/lib/iomgr/timer_generic.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 
 #include <string>
@@ -24,12 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/src/core/lib/iomgr/timer_heap.cc b/src/core/lib/iomgr/timer_heap.cc
index 8f7d950e699..617f76ade0f 100644
--- a/src/core/lib/iomgr/timer_heap.cc
+++ b/src/core/lib/iomgr/timer_heap.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/lib/iomgr/timer_heap.h"
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc
index 5d2015ef50c..9a3362e0ef4 100644
--- a/src/core/lib/iomgr/timer_manager.cc
+++ b/src/core/lib/iomgr/timer_manager.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/lib/iomgr/timer_manager.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/iomgr/timer_manager.h b/src/core/lib/iomgr/timer_manager.h
index c2e662b4943..47b6c132bdc 100644
--- a/src/core/lib/iomgr/timer_manager.h
+++ b/src/core/lib/iomgr/timer_manager.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H
 #define GRPC_SRC_CORE_LIB_IOMGR_TIMER_MANAGER_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 // Timer Manager tries to keep only one thread waiting for the next timeout at
 // all times, and thus effectively preventing the thundering herd problem.
diff --git a/src/core/lib/iomgr/unix_sockets_posix.cc b/src/core/lib/iomgr/unix_sockets_posix.cc
index 01a18602ff6..90ae7817d78 100644
--- a/src/core/lib/iomgr/unix_sockets_posix.cc
+++ b/src/core/lib/iomgr/unix_sockets_posix.cc
@@ -33,11 +33,10 @@
 #include <sys/un.h>
 #endif  // GPR_WINDOWS
 
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/alloc.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/unix_sockets_posix.h"
diff --git a/src/core/lib/iomgr/unix_sockets_posix.h b/src/core/lib/iomgr/unix_sockets_posix.h
index d63a56e8d00..f6e6418a312 100644
--- a/src/core/lib/iomgr/unix_sockets_posix.h
+++ b/src/core/lib/iomgr/unix_sockets_posix.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_UNIX_SOCKETS_POSIX_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/vsock.cc b/src/core/lib/iomgr/vsock.cc
index 45a769998bf..a830668cf4c 100644
--- a/src/core/lib/iomgr/vsock.cc
+++ b/src/core/lib/iomgr/vsock.cc
@@ -21,14 +21,12 @@
 
 #ifdef GRPC_HAVE_VSOCK
 
+#include <grpc/support/alloc.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/core/lib/iomgr/vsock.h b/src/core/lib/iomgr/vsock.h
index 08280c32a0a..1bd3a2c71fe 100644
--- a/src/core/lib/iomgr/vsock.h
+++ b/src/core/lib/iomgr/vsock.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H
 #define GRPC_SRC_CORE_LIB_IOMGR_VSOCK_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 
diff --git a/src/core/lib/iomgr/wakeup_fd_pipe.cc b/src/core/lib/iomgr/wakeup_fd_pipe.cc
index e2640d263c9..9fc196e18a6 100644
--- a/src/core/lib/iomgr/wakeup_fd_pipe.cc
+++ b/src/core/lib/iomgr/wakeup_fd_pipe.cc
@@ -27,7 +27,6 @@
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/lib/iomgr/wakeup_fd_pipe.h"
 #include "src/core/lib/iomgr/wakeup_fd_posix.h"
diff --git a/src/core/lib/promise/activity.cc b/src/core/lib/promise/activity.cc
index 7f495ddb1b3..1a0a52d7b64 100644
--- a/src/core/lib/promise/activity.cc
+++ b/src/core/lib/promise/activity.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/promise/activity.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <vector>
@@ -22,9 +23,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/atomic_utils.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/activity.h b/src/core/lib/promise/activity.h
index b84fc473b62..1bb57bb3f78 100644
--- a/src/core/lib/promise/activity.h
+++ b/src/core/lib/promise/activity.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ACTIVITY_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -28,9 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
diff --git a/src/core/lib/promise/all_ok.h b/src/core/lib/promise/all_ok.h
index 63abaf754d1..72d9d3815b3 100644
--- a/src/core/lib/promise/all_ok.h
+++ b/src/core/lib/promise/all_ok.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ALL_OK_H
 
+#include <grpc/support/port_platform.h>
+
 #include <tuple>
 #include <variant>
 
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/join_state.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/arena_promise.h b/src/core/lib/promise/arena_promise.h
index 7f4bb0de563..e03d6280829 100644
--- a/src/core/lib/promise/arena_promise.h
+++ b/src/core/lib/promise/arena_promise.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_ARENA_PROMISE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <cstddef>
@@ -23,9 +24,6 @@
 #include <utility>
 
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/core/lib/promise/context.h b/src/core/lib/promise/context.h
index c720dfe35b1..a0eed9396e8 100644
--- a/src/core/lib/promise/context.h
+++ b/src/core/lib/promise/context.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H
 #define GRPC_SRC_CORE_LIB_PROMISE_CONTEXT_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/down_cast.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/detail/join_state.h b/src/core/lib/promise/detail/join_state.h
index 032f6b304f0..767ca8d787d 100644
--- a/src/core/lib/promise/detail/join_state.h
+++ b/src/core/lib/promise/detail/join_state.h
@@ -17,15 +17,14 @@
 
 // This file is generated by tools/codegen/core/gen_join.py
 
+#include <grpc/support/port_platform.h>
+
 #include <tuple>
 #include <type_traits>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/detail/promise_factory.h b/src/core/lib/promise/detail/promise_factory.h
index 1e507743929..49dc25c3301 100644
--- a/src/core/lib/promise/detail/promise_factory.h
+++ b/src/core/lib/promise/detail/promise_factory.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_FACTORY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_like.h"
 
 // PromiseFactory is an adaptor class.
diff --git a/src/core/lib/promise/detail/promise_like.h b/src/core/lib/promise/detail/promise_like.h
index 60a7fcc26b0..8515e8b46fb 100644
--- a/src/core/lib/promise/detail/promise_like.h
+++ b/src/core/lib/promise/detail/promise_like.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_PROMISE_LIKE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/poll.h"
 
 // A Promise is a callable object that returns Poll<T> for some T.
diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h
index 47810f19141..da9880044ce 100644
--- a/src/core/lib/promise/detail/seq_state.h
+++ b/src/core/lib/promise/detail/seq_state.h
@@ -17,6 +17,7 @@
 
 // This file is generated by tools/codegen/core/gen_seq.py
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <utility>
@@ -25,9 +26,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/detail/promise_like.h"
diff --git a/src/core/lib/promise/detail/status.h b/src/core/lib/promise/detail/status.h
index 42847c6ba6d..d33c32644cf 100644
--- a/src/core/lib/promise/detail/status.h
+++ b/src/core/lib/promise/detail/status.h
@@ -15,14 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H
 #define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include <grpc/support/port_platform.h>
-
 // Helpers for dealing with absl::Status/StatusOr generically
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/event_engine_wakeup_scheduler.h b/src/core/lib/promise/event_engine_wakeup_scheduler.h
index eedd48357c3..3e494beaa6f 100644
--- a/src/core/lib/promise/event_engine_wakeup_scheduler.h
+++ b/src/core/lib/promise/event_engine_wakeup_scheduler.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H
 #define GRPC_SRC_CORE_LIB_PROMISE_EVENT_ENGINE_WAKEUP_SCHEDULER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
index cc36e1ff747..c66fc233b21 100644
--- a/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
+++ b/src/core/lib/promise/exec_ctx_wakeup_scheduler.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H
 #define GRPC_SRC_CORE_LIB_PROMISE_EXEC_CTX_WAKEUP_SCHEDULER_H
 
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/promise/for_each.h b/src/core/lib/promise/for_each.h
index 5fcaf0094a0..c990f249845 100644
--- a/src/core/lib/promise/for_each.h
+++ b/src/core/lib/promise/for_each.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_FOR_EACH_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -24,9 +25,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h
index d75aec9a5ff..55d18aa74c7 100644
--- a/src/core/lib/promise/if.h
+++ b/src/core/lib/promise/if.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_IF_H
 #define GRPC_SRC_CORE_LIB_PROMISE_IF_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/inter_activity_latch.h b/src/core/lib/promise/inter_activity_latch.h
index c5e89626505..a5a614dcf9f 100644
--- a/src/core/lib/promise/inter_activity_latch.h
+++ b/src/core/lib/promise/inter_activity_latch.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_LATCH_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -22,9 +23,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h
index f6a2144dadb..08e71608e31 100644
--- a/src/core/lib/promise/inter_activity_pipe.h
+++ b/src/core/lib/promise/inter_activity_pipe.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_INTER_ACTIVITY_PIPE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <array>
@@ -22,9 +23,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/promise/interceptor_list.h b/src/core/lib/promise/interceptor_list.h
index d75e6452892..a36f90d1142 100644
--- a/src/core/lib/promise/interceptor_list.h
+++ b/src/core/lib/promise/interceptor_list.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H
 #define GRPC_SRC_CORE_LIB_PROMISE_INTERCEPTOR_LIST_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,9 +28,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/join.h b/src/core/lib/promise/join.h
index 0206baabccc..81619e33142 100644
--- a/src/core/lib/promise/join.h
+++ b/src/core/lib/promise/join.h
@@ -15,14 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_JOIN_H
 #define GRPC_SRC_CORE_LIB_PROMISE_JOIN_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <tuple>
 
 #include "absl/meta/type_traits.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/join_state.h"
 #include "src/core/lib/promise/map.h"
 
diff --git a/src/core/lib/promise/latch.h b/src/core/lib/promise/latch.h
index 10f4776117f..63e298016b8 100644
--- a/src/core/lib/promise/latch.h
+++ b/src/core/lib/promise/latch.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_LATCH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_LATCH_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -24,9 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/loop.h b/src/core/lib/promise/loop.h
index a7e4195cdea..768746f7b60 100644
--- a/src/core/lib/promise/loop.h
+++ b/src/core/lib/promise/loop.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_LOOP_H
 #define GRPC_SRC_CORE_LIB_PROMISE_LOOP_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/construct_destruct.h"
diff --git a/src/core/lib/promise/map.h b/src/core/lib/promise/map.h
index 3ba8c19c2f6..52023fd2dc7 100644
--- a/src/core/lib/promise/map.h
+++ b/src/core/lib/promise/map.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_H
 #define GRPC_SRC_CORE_LIB_PROMISE_MAP_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <tuple>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/promise/map_pipe.h b/src/core/lib/promise/map_pipe.h
index 2915a9376b5..1888100fbb5 100644
--- a/src/core/lib/promise/map_pipe.h
+++ b/src/core/lib/promise/map_pipe.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_MAP_PIPE_H
 
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/for_each.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h
index 02c8d2f97a4..fa77ecb03fb 100644
--- a/src/core/lib/promise/mpsc.h
+++ b/src/core/lib/promise/mpsc.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_MPSC_H
 #define GRPC_SRC_CORE_LIB_PROMISE_MPSC_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/wait_set.h"
diff --git a/src/core/lib/promise/observable.h b/src/core/lib/promise/observable.h
index 0f500d66317..671348ff9a2 100644
--- a/src/core/lib/promise/observable.h
+++ b/src/core/lib/promise/observable.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_OBSERVABLE_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/container/flat_hash_set.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc
index 79c310c9806..ed0e3af639b 100644
--- a/src/core/lib/promise/party.cc
+++ b/src/core/lib/promise/party.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/promise/party.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
@@ -21,9 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h
index d2051aa6083..9066c3a7de3 100644
--- a/src/core/lib/promise/party.h
+++ b/src/core/lib/promise/party.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PARTY_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PARTY_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,10 +29,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/context.h"
diff --git a/src/core/lib/promise/pipe.h b/src/core/lib/promise/pipe.h
index f3dac4532af..71ce810b704 100644
--- a/src/core/lib/promise/pipe.h
+++ b/src/core/lib/promise/pipe.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PIPE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PIPE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -27,9 +28,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/if.h"
diff --git a/src/core/lib/promise/poll.h b/src/core/lib/promise/poll.h
index 9b895cea032..879a5f42335 100644
--- a/src/core/lib/promise/poll.h
+++ b/src/core/lib/promise/poll.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_POLL_H
 #define GRPC_SRC_CORE_LIB_PROMISE_POLL_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/construct_destruct.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/prioritized_race.h b/src/core/lib/promise/prioritized_race.h
index bd179c33313..166c4d2dad1 100644
--- a/src/core/lib/promise/prioritized_race.h
+++ b/src/core/lib/promise/prioritized_race.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PRIORITIZED_RACE_H
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 namespace grpc_core {
 
 namespace promise_detail {
diff --git a/src/core/lib/promise/promise.h b/src/core/lib/promise/promise.h
index cb26a165071..b5ac75d73d2 100644
--- a/src/core/lib/promise/promise.h
+++ b/src/core/lib/promise/promise.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <type_traits>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/promise/promise_mutex.h b/src/core/lib/promise/promise_mutex.h
index b7014da2494..c17750ff066 100644
--- a/src/core/lib/promise/promise_mutex.h
+++ b/src/core/lib/promise/promise_mutex.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H
 #define GRPC_SRC_CORE_LIB_PROMISE_PROMISE_MUTEX_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/promise/race.h b/src/core/lib/promise/race.h
index 83de1a617d7..a17fc074b7d 100644
--- a/src/core/lib/promise/race.h
+++ b/src/core/lib/promise/race.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_RACE_H
 #define GRPC_SRC_CORE_LIB_PROMISE_RACE_H
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 namespace grpc_core {
 
 namespace promise_detail {
diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h
index 40051ae4939..80cd2981308 100644
--- a/src/core/lib/promise/seq.h
+++ b/src/core/lib/promise/seq.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_SEQ_H
 #define GRPC_SRC_CORE_LIB_PROMISE_SEQ_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/detail/seq_state.h"
diff --git a/src/core/lib/promise/sleep.cc b/src/core/lib/promise/sleep.cc
index d31e2a82595..53ae975660f 100644
--- a/src/core/lib/promise/sleep.cc
+++ b/src/core/lib/promise/sleep.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/lib/promise/sleep.h"
 
-#include <utility>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/event_engine/event_engine_context.h"  // IWYU pragma: keep
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/promise/sleep.h b/src/core/lib/promise/sleep.h
index 0ae4232d7b7..83885a07790 100644
--- a/src/core/lib/promise/sleep.h
+++ b/src/core/lib/promise/sleep.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H
 #define GRPC_SRC_CORE_LIB_PROMISE_SLEEP_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h
index 250dce50504..1152694b1f0 100644
--- a/src/core/lib/promise/status_flag.h
+++ b/src/core/lib/promise/status_flag.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
 #define GRPC_SRC_CORE_LIB_PROMISE_STATUS_FLAG_H
 
+#include <grpc/support/port_platform.h>
+
 #include <ostream>
 
 #include "absl/log/check.h"
@@ -22,9 +24,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/status.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/promise/switch.h b/src/core/lib/promise/switch.h
index eed6e89928b..1bb05507ef2 100644
--- a/src/core/lib/promise/switch.h
+++ b/src/core/lib/promise/switch.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H
 #define GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/promise_factory.h"
 #include "src/core/lib/promise/if.h"
 
diff --git a/src/core/lib/promise/try_join.h b/src/core/lib/promise/try_join.h
index 5cde944fe41..e80eaee9a89 100644
--- a/src/core/lib/promise/try_join.h
+++ b/src/core/lib/promise/try_join.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H
 #define GRPC_SRC_CORE_LIB_PROMISE_TRY_JOIN_H
 
+#include <grpc/support/port_platform.h>
+
 #include <tuple>
 #include <variant>
 
@@ -22,9 +24,6 @@
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/join_state.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/promise/try_seq.h b/src/core/lib/promise/try_seq.h
index 7cda223ac67..e7a09b4ab7d 100644
--- a/src/core/lib/promise/try_seq.h
+++ b/src/core/lib/promise/try_seq.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H
 #define GRPC_SRC_CORE_LIB_PROMISE_TRY_SEQ_H
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <type_traits>
@@ -24,9 +25,6 @@
 #include "absl/meta/type_traits.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/detail/basic_seq.h"
 #include "src/core/lib/promise/detail/promise_like.h"
 #include "src/core/lib/promise/detail/seq_state.h"
diff --git a/src/core/lib/promise/wait_for_callback.h b/src/core/lib/promise/wait_for_callback.h
index 6aabfe57970..cdebb5f085a 100644
--- a/src/core/lib/promise/wait_for_callback.h
+++ b/src/core/lib/promise/wait_for_callback.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H
 #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_FOR_CALLBACK_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/promise/wait_set.h b/src/core/lib/promise/wait_set.h
index d58788a057c..a625f01433b 100644
--- a/src/core/lib/promise/wait_set.h
+++ b/src/core/lib/promise/wait_set.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H
 #define GRPC_SRC_CORE_LIB_PROMISE_WAIT_SET_H
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/hash/hash.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/src/core/lib/resource_quota/api.cc b/src/core/lib/resource_quota/api.cc
index 113685e08f4..8438fdc35f5 100644
--- a/src/core/lib/resource_quota/api.cc
+++ b/src/core/lib/resource_quota/api.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/resource_quota/api.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -22,11 +25,6 @@
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/src/core/lib/resource_quota/api.h b/src/core/lib/resource_quota/api.h
index f1a60fb3772..9d80d576afb 100644
--- a/src/core/lib/resource_quota/api.h
+++ b/src/core/lib/resource_quota/api.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_API_H
 
-#include <stddef.h>
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/src/core/lib/resource_quota/arena.cc b/src/core/lib/resource_quota/arena.cc
index 4fb33b266f7..e3b24dc739b 100644
--- a/src/core/lib/resource_quota/arena.cc
+++ b/src/core/lib/resource_quota/arena.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/lib/resource_quota/arena.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <new>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/alloc.h"
 namespace grpc_core {
diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h
index fd962df93a8..fa46c07c664 100644
--- a/src/core/lib/resource_quota/arena.h
+++ b/src/core/lib/resource_quota/arena.h
@@ -25,6 +25,8 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_ARENA_H
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -32,9 +34,6 @@
 #include <memory>
 #include <utility>
 
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/alloc.h"
diff --git a/src/core/lib/resource_quota/connection_quota.cc b/src/core/lib/resource_quota/connection_quota.cc
index 846883f78c3..021628c3695 100644
--- a/src/core/lib/resource_quota/connection_quota.cc
+++ b/src/core/lib/resource_quota/connection_quota.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/lib/resource_quota/connection_quota.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <cstdint>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 ConnectionQuota::ConnectionQuota() = default;
diff --git a/src/core/lib/resource_quota/connection_quota.h b/src/core/lib/resource_quota/connection_quota.h
index ac0aa6cdb29..4181a1878a1 100644
--- a/src/core/lib/resource_quota/connection_quota.h
+++ b/src/core/lib/resource_quota/connection_quota.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_CONNECTION_QUOTA_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <limits>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc
index ee785e62adf..a69792a7d10 100644
--- a/src/core/lib/resource_quota/memory_quota.cc
+++ b/src/core/lib/resource_quota/memory_quota.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/resource_quota/memory_quota.h"
 
+#include <grpc/event_engine/internal/memory_allocator_impl.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -29,11 +32,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/internal/memory_allocator_impl.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h"
 #include "src/core/lib/promise/loop.h"
diff --git a/src/core/lib/resource_quota/memory_quota.h b/src/core/lib/resource_quota/memory_quota.h
index 39c7d83a48a..85395b448d3 100644
--- a/src/core/lib/resource_quota/memory_quota.h
+++ b/src/core/lib/resource_quota/memory_quota.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_MEMORY_QUOTA_H
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <array>
@@ -32,11 +35,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/resource_quota/periodic_update.cc b/src/core/lib/resource_quota/periodic_update.cc
index b7f9e9b9c03..f75cddc041a 100644
--- a/src/core/lib/resource_quota/periodic_update.cc
+++ b/src/core/lib/resource_quota/periodic_update.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/resource_quota/periodic_update.h"
 
-#include <atomic>
-
 #include <grpc/support/port_platform.h>
 
+#include <atomic>
+
 #include "src/core/util/useful.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/resource_quota/periodic_update.h b/src/core/lib/resource_quota/periodic_update.h
index 7a91510ef77..950df574815 100644
--- a/src/core/lib/resource_quota/periodic_update.h
+++ b/src/core/lib/resource_quota/periodic_update.h
@@ -15,14 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_PERIODIC_UPDATE_H
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <atomic>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/resource_quota/resource_quota.h b/src/core/lib/resource_quota/resource_quota.h
index 0704a162eef..ffe61903255 100644
--- a/src/core/lib/resource_quota/resource_quota.h
+++ b/src/core/lib/resource_quota/resource_quota.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_RESOURCE_QUOTA_H
 
-#include <string>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/thread_quota.h"
 #include "src/core/util/cpp_impl_of.h"
diff --git a/src/core/lib/resource_quota/thread_quota.cc b/src/core/lib/resource_quota/thread_quota.cc
index 73e8b224402..381375427e2 100644
--- a/src/core/lib/resource_quota/thread_quota.cc
+++ b/src/core/lib/resource_quota/thread_quota.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/resource_quota/thread_quota.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+
 namespace grpc_core {
 
 ThreadQuota::ThreadQuota() = default;
diff --git a/src/core/lib/resource_quota/thread_quota.h b/src/core/lib/resource_quota/thread_quota.h
index 965436f20df..18a6e13e7f1 100644
--- a/src/core/lib/resource_quota/thread_quota.h
+++ b/src/core/lib/resource_quota/thread_quota.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
 #define GRPC_SRC_CORE_LIB_RESOURCE_QUOTA_THREAD_QUOTA_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstddef>
 #include <limits>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/lib/security/authorization/audit_logging.cc b/src/core/lib/security/authorization/audit_logging.cc
index 2f8ac055c1c..4a6b8b97b25 100644
--- a/src/core/lib/security/authorization/audit_logging.cc
+++ b/src/core/lib/security/authorization/audit_logging.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/security/authorization/audit_logging.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
@@ -27,11 +31,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/stdout_logger.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/security/authorization/audit_logging.h b/src/core/lib/security/authorization/audit_logging.h
index 1f97120cd60..899e0dcc131 100644
--- a/src/core/lib/security/authorization/audit_logging.h
+++ b/src/core/lib/security/authorization/audit_logging.h
@@ -19,17 +19,16 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUDIT_LOGGING_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/authorization_engine.h b/src/core/lib/security/authorization/authorization_engine.h
index 4dca42bea85..dcd8ec5d4fe 100644
--- a/src/core/lib/security/authorization/authorization_engine.h
+++ b/src/core/lib/security/authorization/authorization_engine.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/util/ref_counted.h"
 
diff --git a/src/core/lib/security/authorization/authorization_policy_provider.h b/src/core/lib/security/authorization/authorization_policy_provider.h
index 6dfdc8fb875..ce0a9c7604f 100644
--- a/src/core/lib/security/authorization/authorization_policy_provider.h
+++ b/src/core/lib/security/authorization/authorization_policy_provider.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_POLICY_PROVIDER_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/security/authorization/authorization_engine.h"
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/security/authorization/cel_authorization_engine.cc b/src/core/lib/security/authorization/cel_authorization_engine.cc
index d2d14ebbb8b..47d8f37a007 100644
--- a/src/core/lib/security/authorization/cel_authorization_engine.cc
+++ b/src/core/lib/security/authorization/cel_authorization_engine.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/security/authorization/cel_authorization_engine.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include "upb/base/string_view.h"
 #include "upb/message/map.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/lib/security/authorization/cel_authorization_engine.h b/src/core/lib/security/authorization/cel_authorization_engine.h
index 5122b96cab5..03ea185d0bb 100644
--- a/src/core/lib/security/authorization/cel_authorization_engine.h
+++ b/src/core/lib/security/authorization/cel_authorization_engine.h
@@ -16,6 +16,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -24,13 +26,10 @@
 #include "absl/container/flat_hash_set.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/mock_cel/activation.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/lib/security/authorization/evaluate_args.cc b/src/core/lib/security/authorization/evaluate_args.cc
index 0a4e23d1923..ca572e13d45 100644
--- a/src/core/lib/security/authorization/evaluate_args.cc
+++ b/src/core/lib/security/authorization/evaluate_args.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/security/authorization/evaluate_args.h"
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/log/log.h"
@@ -21,10 +23,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/numbers.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/security/credentials/tls/tls_utils.h"
diff --git a/src/core/lib/security/authorization/evaluate_args.h b/src/core/lib/security/authorization/evaluate_args.h
index 69cf2ac4ee8..226df0aac8d 100644
--- a/src/core/lib/security/authorization/evaluate_args.h
+++ b/src/core/lib/security/authorization/evaluate_args.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.cc b/src/core/lib/security/authorization/grpc_authorization_engine.cc
index 4fed6af4fed..a2b38af3d39 100644
--- a/src/core/lib/security/authorization/grpc_authorization_engine.cc
+++ b/src/core/lib/security/authorization/grpc_authorization_engine.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <map>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/lib/security/authorization/authorization_engine.h"
 
diff --git a/src/core/lib/security/authorization/grpc_authorization_engine.h b/src/core/lib/security/authorization/grpc_authorization_engine.h
index 1ac877a5f4c..514d5343b04 100644
--- a/src/core/lib/security/authorization/grpc_authorization_engine.h
+++ b/src/core/lib/security/authorization/grpc_authorization_engine.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/authorization_engine.h"
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/matchers.h"
diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc
index 171fd61b3f1..8830bf5e599 100644
--- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc
+++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.cc
@@ -14,21 +14,19 @@
 
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
 
-#include <stdint.h>
-
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <stdint.h>
+
+#include <utility>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
diff --git a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h
index f7e6aff40d7..bac11102126 100644
--- a/src/core/lib/security/authorization/grpc_authorization_policy_provider.h
+++ b/src/core/lib/security/authorization/grpc_authorization_policy_provider.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_POLICY_PROVIDER_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -23,11 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/security/authorization/authorization_engine.h"
 #include "src/core/lib/security/authorization/authorization_policy_provider.h"
 #include "src/core/lib/security/authorization/rbac_translator.h"
diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
index 540b2af1f67..8e3c1e2f276 100644
--- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc
+++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/security/authorization/grpc_server_authz_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -22,9 +24,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h
index 733142cfca3..10ad7281059 100644
--- a/src/core/lib/security/authorization/grpc_server_authz_filter.h
+++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_SERVER_AUTHZ_FILTER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/lib/security/authorization/matchers.cc b/src/core/lib/security/authorization/matchers.cc
index 887f74e79ed..c113514f233 100644
--- a/src/core/lib/security/authorization/matchers.cc
+++ b/src/core/lib/security/authorization/matchers.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/security/authorization/matchers.h"
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -22,10 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h
index eaadd07b4e7..ce413534ef5 100644
--- a/src/core/lib/security/authorization/matchers.h
+++ b/src/core/lib/security/authorization/matchers.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -22,9 +23,6 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/rbac_policy.h"
diff --git a/src/core/lib/security/authorization/mock_cel/activation.h b/src/core/lib/security/authorization/mock_cel/activation.h
index 174aeac91e7..ca3cb392a25 100644
--- a/src/core/lib/security/authorization/mock_cel/activation.h
+++ b/src/core/lib/security/authorization/mock_cel/activation.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_ACTIVATION_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
index 873d085ffe8..b9f94b15523 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_expr_builder_factory.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPR_BUILDER_FACTORY_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
 #include "src/core/lib/security/authorization/mock_cel/flat_expr_builder.h"
 
diff --git a/src/core/lib/security/authorization/mock_cel/cel_expression.h b/src/core/lib/security/authorization/mock_cel/cel_expression.h
index 8e4a8b0c042..63da5c943b9 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_expression.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_expression.h
@@ -15,15 +15,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_CEL_EXPRESSION_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/mock_cel/activation.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
 
diff --git a/src/core/lib/security/authorization/mock_cel/cel_value.h b/src/core/lib/security/authorization/mock_cel/cel_value.h
index 5a7531121aa..2137595fe4f 100644
--- a/src/core/lib/security/authorization/mock_cel/cel_value.h
+++ b/src/core/lib/security/authorization/mock_cel/cel_value.h
@@ -30,6 +30,7 @@
 //    std::string* msg("test");
 //    CelValue value = CelValue::CreateString(msg);
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -39,8 +40,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace mock_cel {
 
diff --git a/src/core/lib/security/authorization/mock_cel/evaluator_core.h b/src/core/lib/security/authorization/mock_cel/evaluator_core.h
index 09f0add6c81..232db020d66 100644
--- a/src/core/lib/security/authorization/mock_cel/evaluator_core.h
+++ b/src/core/lib/security/authorization/mock_cel/evaluator_core.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_EVALUATOR_CORE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/mock_cel/activation.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
 #include "src/core/lib/security/authorization/mock_cel/cel_value.h"
diff --git a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
index 608d9d9cfa1..bd4993e3917 100644
--- a/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
+++ b/src/core/lib/security/authorization/mock_cel/flat_expr_builder.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_MOCK_CEL_FLAT_EXPR_BUILDER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <set>
 #include <string>
@@ -23,9 +25,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "google/api/expr/v1alpha1/syntax.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/mock_cel/cel_expression.h"
 #include "src/core/lib/security/authorization/mock_cel/evaluator_core.h"
 
diff --git a/src/core/lib/security/authorization/rbac_policy.cc b/src/core/lib/security/authorization/rbac_policy.cc
index 6dfa7b3e3cf..de2ade9f16f 100644
--- a/src/core/lib/security/authorization/rbac_policy.cc
+++ b/src/core/lib/security/authorization/rbac_policy.cc
@@ -14,14 +14,14 @@
 
 #include "src/core/lib/security/authorization/rbac_policy.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 //
diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h
index 03b4e283cde..9ad0bb0bca7 100644
--- a/src/core/lib/security/authorization/rbac_policy.h
+++ b/src/core/lib/security/authorization/rbac_policy.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -23,10 +25,6 @@
 #include <vector>
 
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/matchers.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc
index 342f9248371..7c3863e6824 100644
--- a/src/core/lib/security/authorization/rbac_translator.cc
+++ b/src/core/lib/security/authorization/rbac_translator.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/security/authorization/rbac_translator.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -31,11 +34,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/src/core/lib/security/authorization/rbac_translator.h b/src/core/lib/security/authorization/rbac_translator.h
index 18c1fed3b99..446583452a0 100644
--- a/src/core/lib/security/authorization/rbac_translator.h
+++ b/src/core/lib/security/authorization/rbac_translator.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/rbac_policy.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/authorization/stdout_logger.cc b/src/core/lib/security/authorization/stdout_logger.cc
index 9314d21a0e6..f2fc5eaa6a6 100644
--- a/src/core/lib/security/authorization/stdout_logger.cc
+++ b/src/core/lib/security/authorization/stdout_logger.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/lib/security/authorization/stdout_logger.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdio>
 #include <memory>
 #include <string>
@@ -25,10 +29,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/src/core/lib/security/authorization/stdout_logger.h b/src/core/lib/security/authorization/stdout_logger.h
index a2186af7fb0..cc03d3a3252 100644
--- a/src/core/lib/security/authorization/stdout_logger.h
+++ b/src/core/lib/security/authorization/stdout_logger.h
@@ -15,16 +15,16 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_AUTHORIZATION_STDOUT_LOGGER_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace experimental {
 
diff --git a/src/core/lib/security/certificate_provider/certificate_provider_factory.h b/src/core/lib/security/certificate_provider/certificate_provider_factory.h
index 9da32e9233f..72412caa4e5 100644
--- a/src/core/lib/security/certificate_provider/certificate_provider_factory.h
+++ b/src/core/lib/security/certificate_provider/certificate_provider_factory.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_FACTORY_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc
index 7a213fdc884..40b9a6a90c9 100644
--- a/src/core/lib/security/certificate_provider/certificate_provider_registry.cc
+++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 void CertificateProviderRegistry::Builder::RegisterCertificateProviderFactory(
diff --git a/src/core/lib/security/certificate_provider/certificate_provider_registry.h b/src/core/lib/security/certificate_provider/certificate_provider_registry.h
index 84eee65d392..636884528d6 100644
--- a/src/core/lib/security/certificate_provider/certificate_provider_registry.h
+++ b/src/core/lib/security/certificate_provider/certificate_provider_registry.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CERTIFICATE_PROVIDER_CERTIFICATE_PROVIDER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc
index 67a219d9038..46fe754b728 100644
--- a/src/core/lib/security/context/security_context.cc
+++ b/src/core/lib/security/context/security_context.cc
@@ -18,19 +18,17 @@
 
 #include "src/core/lib/security/context/security_context.h"
 
-#include <string.h>
-
-#include <algorithm>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
+
+#include <algorithm>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/context/security_context.h b/src/core/lib/security/context/security_context.h
index cc3b21620a5..1a5b7afa320 100644
--- a/src/core/lib/security/context/security_context.h
+++ b/src/core/lib/security/context/security_context.h
@@ -19,19 +19,17 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CONTEXT_SECURITY_CONTEXT_H
 
-#include <stddef.h>
-
-#include <memory>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
+
+#include <memory>
+#include <utility>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/security/credentials/credentials.h"  // IWYU pragma: keep
diff --git a/src/core/lib/security/credentials/alts/alts_credentials.cc b/src/core/lib/security/credentials/alts/alts_credentials.cc
index 45888d0e808..1e58abcf215 100644
--- a/src/core/lib/security/credentials/alts/alts_credentials.cc
+++ b/src/core/lib/security/credentials/alts/alts_credentials.cc
@@ -18,13 +18,13 @@
 
 #include "src/core/lib/security/credentials/alts/alts_credentials.h"
 
-#include <utility>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include <utility>
+
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 #include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment.cc b/src/core/lib/security/credentials/alts/check_gcp_environment.cc
index 864620c9a5a..37628d18321 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment.cc
@@ -19,14 +19,13 @@
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 
 #include <ctype.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "absl/log/log.h"
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 const size_t kBiosDataBufferSize = 256;
 
 static char* trim(const char* src) {
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
index c4d767a3d2b..47bb4b73c4d 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
@@ -20,10 +20,9 @@
 
 #ifdef GPR_LINUX
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
index 4de3a24eae6..bf64fe60a36 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
@@ -21,7 +21,6 @@
 #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS)
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
index df6a6240974..462ba6bcb31 100644
--- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
+++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
@@ -20,14 +20,13 @@
 
 #ifdef GPR_WINDOWS
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <shellapi.h>
 #include <stdio.h>
 #include <tchar.h>
 #include <windows.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
index a6053a5d810..37a1856713a 100644
--- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
+++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include "absl/log/log.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
diff --git a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
index 6b11ab3f623..a52dfe96173 100644
--- a/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
+++ b/src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
@@ -18,11 +18,11 @@
 
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+
 grpc_alts_credentials_options* grpc_alts_credentials_options_copy(
     const grpc_alts_credentials_options* options) {
   if (options != nullptr && options->vtable != nullptr &&
diff --git a/src/core/lib/security/credentials/call_creds_util.cc b/src/core/lib/security/credentials/call_creds_util.cc
index 3acc0708f62..e97ba305f17 100644
--- a/src/core/lib/security/credentials/call_creds_util.cc
+++ b/src/core/lib/security/credentials/call_creds_util.cc
@@ -16,16 +16,14 @@
 
 #include "src/core/lib/security/credentials/call_creds_util.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/lib/security/credentials/call_creds_util.h b/src/core/lib/security/credentials/call_creds_util.h
index 6e95f100f94..62fd38a5df7 100644
--- a/src/core/lib/security/credentials/call_creds_util.h
+++ b/src/core/lib/security/credentials/call_creds_util.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CALL_CREDS_UTIL_H
 
-#include <string>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/transport/transport.h"
 
diff --git a/src/core/lib/security/credentials/channel_creds_registry.h b/src/core/lib/security/credentials/channel_creds_registry.h
index 17771ff8d9e..881bb607792 100644
--- a/src/core/lib/security/credentials/channel_creds_registry.h
+++ b/src/core/lib/security/credentials/channel_creds_registry.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/credentials/channel_creds_registry_init.cc b/src/core/lib/security/credentials/channel_creds_registry_init.cc
index de2f7d143b9..cf55ff2da64 100644
--- a/src/core/lib/security/credentials/channel_creds_registry_init.cc
+++ b/src/core/lib/security/credentials/channel_creds_registry_init.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -30,6 +23,12 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/composite/composite_credentials.cc b/src/core/lib/security/credentials/composite/composite_credentials.cc
index d5d8c76baf4..81b6463421f 100644
--- a/src/core/lib/security/credentials/composite/composite_credentials.cc
+++ b/src/core/lib/security/credentials/composite/composite_credentials.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/security/credentials/composite/composite_credentials.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <cstring>
 #include <memory>
 #include <vector>
@@ -25,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/src/core/lib/security/credentials/composite/composite_credentials.h b/src/core/lib/security/credentials/composite/composite_credentials.h
index 64b05de2cf1..ff2728f0b4a 100644
--- a/src/core/lib/security/credentials/composite/composite_credentials.h
+++ b/src/core/lib/security/credentials/composite/composite_credentials.h
@@ -19,19 +19,18 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
 
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
 
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc
index 6f43677d8f0..69a0180b93c 100644
--- a/src/core/lib/security/credentials/credentials.cc
+++ b/src/core/lib/security/credentials/credentials.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/lib/security/credentials/credentials.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/credentials/credentials.h b/src/core/lib/security/credentials/credentials.h
index 57f0eaaa62b..2daef3c6b00 100644
--- a/src/core/lib/security/credentials/credentials.h
+++ b/src/core/lib/security/credentials/credentials.h
@@ -19,14 +19,6 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CREDENTIALS_H
 
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,6 +26,13 @@
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
index 3348e3c5aba..13a46dadda1 100644
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.cc
@@ -15,6 +15,13 @@
 //
 #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <map>
@@ -28,15 +35,6 @@
 #include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/env.h"
diff --git a/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/src/core/lib/security/credentials/external/aws_external_account_credentials.h
index 3ccac92ad7a..a8a2f19ae47 100644
--- a/src/core/lib/security/credentials/external/aws_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/aws_external_account_credentials.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
diff --git a/src/core/lib/security/credentials/external/aws_request_signer.cc b/src/core/lib/security/credentials/external/aws_request_signer.cc
index 87ca4b37918..82fb3fc814d 100644
--- a/src/core/lib/security/credentials/external/aws_request_signer.cc
+++ b/src/core/lib/security/credentials/external/aws_request_signer.cc
@@ -15,14 +15,15 @@
 //
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 
-#include <utility>
-#include <vector>
-
+#include <grpc/support/port_platform.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/sha.h>
 
+#include <utility>
+#include <vector>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/ascii.h"
 #include "absl/strings/escaping.h"
@@ -34,8 +35,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/lib/security/credentials/external/aws_request_signer.h b/src/core/lib/security/credentials/external/aws_request_signer.h
index 59a5390f795..12ef21342b9 100644
--- a/src/core/lib/security/credentials/external/aws_request_signer.h
+++ b/src/core/lib/security/credentials/external/aws_request_signer.h
@@ -17,11 +17,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_AWS_REQUEST_SIGNER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/uri.h"
 
diff --git a/src/core/lib/security/credentials/external/external_account_credentials.cc b/src/core/lib/security/credentials/external/external_account_credentials.cc
index 7c4955bc09d..9f240d9b051 100644
--- a/src/core/lib/security/credentials/external/external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/external_account_credentials.cc
@@ -15,6 +15,13 @@
 
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -36,15 +43,6 @@
 #include "absl/strings/strip.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/external/aws_external_account_credentials.h"
 #include "src/core/lib/security/credentials/external/file_external_account_credentials.h"
diff --git a/src/core/lib/security/credentials/external/external_account_credentials.h b/src/core/lib/security/credentials/external/external_account_credentials.h
index 3323d21bbf0..bf6a5f1df81 100644
--- a/src/core/lib/security/credentials/external/external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/external_account_credentials.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <functional>
@@ -25,10 +27,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/src/core/lib/security/credentials/external/file_external_account_credentials.cc
index 6c8e1f06062..a02fb698c37 100644
--- a/src/core/lib/security/credentials/external/file_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/file_external_account_credentials.cc
@@ -15,17 +15,16 @@
 //
 #include "src/core/lib/security/credentials/external/file_external_account_credentials.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/lib/security/credentials/external/file_external_account_credentials.h b/src/core/lib/security/credentials/external/file_external_account_credentials.h
index 093f0a02809..2428f92d21a 100644
--- a/src/core/lib/security/credentials/external/file_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/file_external_account_credentials.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_FILE_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/src/core/lib/security/credentials/external/url_external_account_credentials.cc
index 39efb91d8f3..502700a4d64 100644
--- a/src/core/lib/security/credentials/external/url_external_account_credentials.cc
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.cc
@@ -15,6 +15,13 @@
 //
 #include "src/core/lib/security/credentials/external/url_external_account_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <memory>
@@ -27,15 +34,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/core/lib/security/credentials/external/url_external_account_credentials.h b/src/core/lib/security/credentials/external/url_external_account_credentials.h
index d7a28777d2d..6d9e2c7fa97 100644
--- a/src/core/lib/security/credentials/external/url_external_account_credentials.h
+++ b/src/core/lib/security/credentials/external/url_external_account_credentials.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_EXTERNAL_URL_EXTERNAL_ACCOUNT_CREDENTIALS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/external/external_account_credentials.h"
 #include "src/core/util/http_client/httpcli.h"
diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc
index 1e0f6f33eb4..aa61a12b68c 100644
--- a/src/core/lib/security/credentials/fake/fake_credentials.cc
+++ b/src/core/lib/security/credentials/fake/fake_credentials.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/security/security_connector/fake/fake_security_connector.h"
diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h
index fe4fb414593..77fe27268f9 100644
--- a/src/core/lib/security/credentials/fake/fake_credentials.h
+++ b/src/core/lib/security/credentials/fake/fake_credentials.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H
 
-#include <string>
-
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc
index 8b3c8c8701d..31d00e7bfd3 100644
--- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc
+++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h"
 
+#include <grpc/support/time.h>
+
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -23,9 +25,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/status_conversion.h"
diff --git a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h
index 2e75547c402..7e3dfaa2abb 100644
--- a/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h
+++ b/src/core/lib/security/credentials/gcp_service_account_identity/gcp_service_account_identity_credentials.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GCP_SERVICE_ACCOUNT_IDENTITY_GCP_SERVICE_ACCOUNT_IDENTITY_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GCP_SERVICE_ACCOUNT_IDENTITY_GCP_SERVICE_ACCOUNT_IDENTITY_CREDENTIALS_H
 
-#include <string>
-#include <utility>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 
+#include <string>
+#include <utility>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/google_default/credentials_generic.cc b/src/core/lib/security/credentials/google_default/credentials_generic.cc
index f09e5681c88..f07616d85ba 100644
--- a/src/core/lib/security/credentials/google_default/credentials_generic.cc
+++ b/src/core/lib/security/credentials/google_default/credentials_generic.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
 #include "src/core/util/env.h"
diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
index 6581194e911..71999011093 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <string.h>
 
 #include <memory>
@@ -30,16 +38,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.h b/src/core/lib/security/credentials/google_default/google_default_credentials.h
index 889aebde57b..f9dc94e960e 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.h
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.h
@@ -18,13 +18,13 @@
 
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_GOOGLE_DEFAULT_GOOGLE_DEFAULT_CREDENTIALS_H
-#include <utility>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/src/core/lib/security/credentials/iam/iam_credentials.cc b/src/core/lib/security/credentials/iam/iam_credentials.cc
index 8d855978676..15a7cd653ce 100644
--- a/src/core/lib/security/credentials/iam/iam_credentials.cc
+++ b/src/core/lib/security/credentials/iam/iam_credentials.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/security/credentials/iam/iam_credentials.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -26,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/src/core/lib/security/credentials/iam/iam_credentials.h b/src/core/lib/security/credentials/iam/iam_credentials.h
index aa8426048f1..837892211d0 100644
--- a/src/core/lib/security/credentials/iam/iam_credentials.h
+++ b/src/core/lib/security/credentials/iam/iam_credentials.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_IAM_IAM_CREDENTIALS_H
 
-#include <string>
-
-#include "absl/status/statusor.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/lib/security/credentials/insecure/insecure_credentials.cc b/src/core/lib/security/credentials/insecure/insecure_credentials.cc
index a4900ff3281..e9960725cc5 100644
--- a/src/core/lib/security/credentials/insecure/insecure_credentials.cc
+++ b/src/core/lib/security/credentials/insecure/insecure_credentials.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/lib/security/credentials/insecure/insecure_credentials.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h"
 
diff --git a/src/core/lib/security/credentials/jwt/json_token.cc b/src/core/lib/security/credentials/jwt/json_token.cc
index 64c0f425985..eac638a1283 100644
--- a/src/core/lib/security/credentials/jwt/json_token.cc
+++ b/src/core/lib/security/credentials/jwt/json_token.cc
@@ -18,31 +18,28 @@
 
 #include "src/core/lib/security/credentials/jwt/json_token.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+#include <openssl/rsa.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <string>
 #include <utility>
 
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/escaping.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/util/json_util.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/src/core/lib/security/credentials/jwt/json_token.h b/src/core/lib/security/credentials/jwt/json_token.h
index 5576b643ce1..ab4544dbf52 100644
--- a/src/core/lib/security/credentials/jwt/json_token.h
+++ b/src/core/lib/security/credentials/jwt/json_token.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JSON_TOKEN_H
 
-#include <openssl/crypto.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <openssl/crypto.h>
 
 #include "src/core/util/json/json.h"
 
diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/src/core/lib/security/credentials/jwt/jwt_credentials.cc
index ab3cb4af773..c6239b7bc71 100644
--- a/src/core/lib/security/credentials/jwt/jwt_credentials.cc
+++ b/src/core/lib/security/credentials/jwt/jwt_credentials.cc
@@ -17,6 +17,12 @@
 
 #include "src/core/lib/security/credentials/jwt/jwt_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -28,14 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/src/core/lib/security/credentials/jwt/jwt_credentials.h b/src/core/lib/security/credentials/jwt/jwt_credentials.h
index 26dfa169ad4..e666bfac489 100644
--- a/src/core/lib/security/credentials/jwt/jwt_credentials.h
+++ b/src/core/lib/security/credentials/jwt/jwt_credentials.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <string>
@@ -28,13 +33,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/jwt/json_token.h"
diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc
index 5f45ece8056..4d34a06d0dc 100644
--- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc
+++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc
@@ -18,16 +18,8 @@
 
 #include "src/core/lib/security/credentials/jwt/jwt_verifier.h"
 
+#include <grpc/support/port_platform.h>
 #include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
@@ -35,25 +27,30 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <grpc/support/port_platform.h>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
 #include <openssl/param_build.h>
 #endif
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/json.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.h b/src/core/lib/security/credentials/jwt/jwt_verifier.h
index 9ff8ca53831..955e7efed72 100644
--- a/src/core/lib/security/credentials/jwt/jwt_verifier.h
+++ b/src/core/lib/security/credentials/jwt/jwt_verifier.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_JWT_JWT_VERIFIER_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/lib/security/credentials/local/local_credentials.cc b/src/core/lib/security/credentials/local/local_credentials.cc
index 94f975d6d7d..21495ff55d0 100644
--- a/src/core/lib/security/credentials/local/local_credentials.cc
+++ b/src/core/lib/security/credentials/local/local_credentials.cc
@@ -18,11 +18,11 @@
 
 #include "src/core/lib/security/credentials/local/local_credentials.h"
 
-#include <utility>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #include "src/core/lib/security/security_connector/local/local_security_connector.h"
 
 grpc_core::RefCountedPtr<grpc_channel_security_connector>
diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
index 216c038cbf2..0e7f7eb33cf 100644
--- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
+++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc
@@ -18,6 +18,15 @@
 
 #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -34,17 +43,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
index bb91c8a524f..5cba69234d6 100644
--- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
+++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.h
@@ -19,6 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_OAUTH2_OAUTH2_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+
 #include <atomic>
 #include <string>
 #include <utility>
@@ -26,13 +32,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/src/core/lib/security/credentials/plugin/plugin_credentials.cc
index 8fa2bcc6575..1e0bae22f94 100644
--- a/src/core/lib/security/credentials/plugin/plugin_credentials.cc
+++ b/src/core/lib/security/credentials/plugin/plugin_credentials.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/security/credentials/plugin/plugin_credentials.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <memory>
 
@@ -26,10 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/src/core/lib/security/credentials/plugin/plugin_credentials.h b/src/core/lib/security/credentials/plugin/plugin_credentials.h
index 113955240c1..2c25fae8f22 100644
--- a/src/core/lib/security/credentials/plugin/plugin_credentials.h
+++ b/src/core/lib/security/credentials/plugin/plugin_credentials.h
@@ -19,6 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_PLUGIN_PLUGIN_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -27,14 +33,6 @@
 
 #include "absl/container/inlined_vector.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/arena_promise.h"
diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc
index 86eb4518c8e..c434cb73678 100644
--- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc
+++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -26,12 +30,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.h b/src/core/lib/security/credentials/ssl/ssl_credentials.h
index ab4c9a12767..d0f947a537c 100644
--- a/src/core/lib/security/credentials/ssl/ssl_credentials.h
+++ b/src/core/lib/security/credentials/ssl/ssl_credentials.h
@@ -18,16 +18,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_SSL_SSL_CREDENTIALS_H
 
-#include <stddef.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
index 2472244f2c5..23ec403f16e 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc
@@ -16,13 +16,13 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/status/status.h"
+
 void grpc_tls_certificate_distributor::SetKeyMaterials(
     const std::string& cert_name, absl::optional<std::string> pem_root_certs,
     absl::optional<grpc_core::PemKeyCertPairList> pem_key_cert_pairs) {
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h
index f34e664d581..dd295d1cab7 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_DISTRIBUTOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -27,9 +29,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc
index a7ebb6cbdb2..f7a9a05c42c 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_match.cc
@@ -14,6 +14,7 @@
 // limitations under the License.
 //
 
+#include <grpc/support/port_platform.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
@@ -23,9 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
index 0bcabaa6505..db6c5bf98a5 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
+#include <grpc/credentials.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <time.h>
 
@@ -27,12 +31,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h
index cca18a1baeb..56f227d5ad4 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_PROVIDER_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 
 #include <map>
@@ -27,11 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc
index 1be015dcba7..47447ed536c 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -23,11 +26,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/security/credentials/tls/tls_utils.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h
index 5e021948d2f..3b80d9bc852 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h
@@ -17,18 +17,17 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CERTIFICATE_VERIFIER_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <map>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/status/status.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/unique_type_name.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
index 3176dc10caa..69f73476cae 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/ssl_transport_security.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc
index ce1fc4dd1d0..72a113cd592 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc
+++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h"
 
-#include <limits.h>
-
 #include <grpc/support/port_platform.h>
+#include <limits.h>
 
 // IWYU pragma: no_include <ratio>
 #include <memory>
@@ -41,7 +40,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/span.h"
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h
index b9188740c5e..109d1aa4c41 100644
--- a/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h
+++ b/src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_GRPC_TLS_CRL_PROVIDER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/support/port_platform.h>
+#include <openssl/crypto.h>
+
 #include <chrono>
 #include <functional>
 #include <memory>
@@ -26,19 +31,12 @@
 #include <string>
 #include <utility>
 
-#include <openssl/crypto.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/directory_reader.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc
index 5fd5abf419e..acb0d0154ee 100644
--- a/src/core/lib/security/credentials/tls/tls_credentials.cc
+++ b/src/core/lib/security/credentials/tls/tls_credentials.cc
@@ -18,18 +18,17 @@
 
 #include "src/core/lib/security/credentials/tls/tls_credentials.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
diff --git a/src/core/lib/security/credentials/tls/tls_utils.cc b/src/core/lib/security/credentials/tls/tls_utils.cc
index 3b17ad3f7f2..296839a8aea 100644
--- a/src/core/lib/security/credentials/tls/tls_utils.cc
+++ b/src/core/lib/security/credentials/tls/tls_utils.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/security/credentials/tls/tls_utils.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,8 +28,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Based on
diff --git a/src/core/lib/security/credentials/tls/tls_utils.h b/src/core/lib/security/credentials/tls/tls_utils.h
index c26f4e38bbd..d5d2f640a7b 100644
--- a/src/core/lib/security/credentials/tls/tls_utils.h
+++ b/src/core/lib/security/credentials/tls/tls_utils.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TLS_TLS_UTILS_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <vector>
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Matches \a subject_alternative_name with \a matcher. Returns true if there
diff --git a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h
index 6283c044be8..94359e3727a 100644
--- a/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h
+++ b/src/core/lib/security/credentials/token_fetcher/token_fetcher_credentials.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TOKEN_FETCHER_TOKEN_FETCHER_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_TOKEN_FETCHER_TOKEN_FETCHER_CREDENTIALS_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <atomic>
 #include <memory>
 #include <utility>
@@ -25,9 +27,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/status/statusor.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/iomgr/polling_entity.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/lib/security/credentials/xds/xds_credentials.cc b/src/core/lib/security/credentials/xds/xds_credentials.cc
index a0e017498e2..2a98d0ec6e5 100644
--- a/src/core/lib/security/credentials/xds/xds_credentials.cc
+++ b/src/core/lib/security/credentials/xds/xds_credentials.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/security/credentials/xds/xds_credentials.h"
 
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h
index 554d7a57f26..53c16afcbcd 100644
--- a/src/core/lib/security/credentials/xds/xds_credentials.h
+++ b/src/core/lib/security/credentials/xds/xds_credentials.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_XDS_XDS_CREDENTIALS_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <functional>
@@ -27,12 +31,6 @@
 #include <vector>
 
 #include "absl/status/status.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
diff --git a/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/src/core/lib/security/security_connector/alts/alts_security_connector.cc
index f30cecdd01a..a026a72f7f7 100644
--- a/src/core/lib/security/security_connector/alts/alts_security_connector.cc
+++ b/src/core/lib/security/security_connector/alts/alts_security_connector.cc
@@ -18,6 +18,13 @@
 
 #include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <algorithm>
@@ -28,15 +35,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/src/core/lib/security/security_connector/fake/fake_security_connector.cc
index 20425dc2c91..b0373236168 100644
--- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc
+++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/lib/security/security_connector/fake/fake_security_connector.h"
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -31,13 +36,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
index 79ea0cd337c..da250fea598 100644
--- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
+++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h
index 9fc962b92ca..018689e5f78 100644
--- a/src/core/lib/security/security_connector/insecure/insecure_security_connector.h
+++ b/src/core/lib/security/security_connector/insecure/insecure_security_connector.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_INSECURE_INSECURE_SECURITY_CONNECTOR_H
 
-#include <utility>
-
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/security/security_connector/load_system_roots_supported.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc
index 52b657185a6..11a9c3f4957 100644
--- a/src/core/lib/security/security_connector/load_system_roots_supported.cc
+++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc
@@ -16,26 +16,24 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \
     defined(GPR_APPLE)
 
 #include <dirent.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/load_system_roots.h"
diff --git a/src/core/lib/security/security_connector/load_system_roots_windows.cc b/src/core/lib/security/security_connector/load_system_roots_windows.cc
index 118f013c323..86fd628682c 100644
--- a/src/core/lib/security/security_connector/load_system_roots_windows.cc
+++ b/src/core/lib/security/security_connector/load_system_roots_windows.cc
@@ -23,13 +23,12 @@
 #pragma comment(lib, "crypt32")
 
 #include <esent.h>
-#include <wincrypt.h>
-
-#include <vector>
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
+#include <wincrypt.h>
+
+#include <vector>
 
 #include "src/core/lib/security/security_connector/load_system_roots.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/lib/security/security_connector/local/local_security_connector.cc b/src/core/lib/security/security_connector/local/local_security_connector.cc
index a61dc6aa4d0..5056494e6b2 100644
--- a/src/core/lib/security/security_connector/local/local_security_connector.cc
+++ b/src/core/lib/security/security_connector/local/local_security_connector.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/lib/security/security_connector/local/local_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -30,13 +35,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc
index d3c9906f8b6..481175c76e0 100644
--- a/src/core/lib/security/security_connector/security_connector.cc
+++ b/src/core/lib/security/security_connector/security_connector.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/security/security_connector/security_connector.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/security/security_connector/security_connector.h b/src/core/lib/security/security_connector/security_connector.h
index 2e44b14fe00..4c0b788eef4 100644
--- a/src/core/lib/security/security_connector/security_connector.h
+++ b/src/core/lib/security/security_connector/security_connector.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SECURITY_CONNECTOR_H
 
-#include <memory>
-
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
index 0ec65282f0c..0c8dc6043f8 100644
--- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
+++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/security/security_connector/ssl/ssl_security_connector.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -30,10 +32,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
index 5362e7503bc..436e2c32913 100644
--- a/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
+++ b/src/core/lib/security/security_connector/ssl/ssl_security_connector.h
@@ -18,13 +18,12 @@
 
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_SSL_SECURITY_CONNECTOR_H
-#include <stddef.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/ssl_transport_security.h"
diff --git a/src/core/lib/security/security_connector/ssl_utils.cc b/src/core/lib/security/security_connector/ssl_utils.cc
index e3078062a89..2fcd67d1e85 100644
--- a/src/core/lib/security/security_connector/ssl_utils.cc
+++ b/src/core/lib/security/security_connector/ssl_utils.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -30,16 +38,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/src/core/lib/security/security_connector/ssl_utils.h b/src/core/lib/security/security_connector/ssl_utils.h
index f60b679c763..08973d5b7fc 100644
--- a/src/core/lib/security/security_connector/ssl_utils.h
+++ b/src/core/lib/security/security_connector/ssl_utils.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_SSL_UTILS_H
 
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
@@ -28,13 +33,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/src/core/lib/security/security_connector/tls/tls_security_connector.cc
index b6c492fe458..d708ce8abfa 100644
--- a/src/core/lib/security/security_connector/tls/tls_security_connector.cc
+++ b/src/core/lib/security/security_connector/tls/tls_security_connector.cc
@@ -18,6 +18,11 @@
 
 #include "src/core/lib/security/security_connector/tls/tls_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <memory>
@@ -29,13 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/security/security_connector/tls/tls_security_connector.h b/src/core/lib/security/security_connector/tls/tls_security_connector.h
index 3c4e90436dc..27e915a6143 100644
--- a/src/core/lib/security/security_connector/tls/tls_security_connector.h
+++ b/src/core/lib/security/security_connector/tls/tls_security_connector.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H
 #define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_TLS_TLS_SECURITY_CONNECTOR_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 
@@ -26,12 +31,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/security/transport/auth_filters.h b/src/core/lib/security/transport/auth_filters.h
index 71834db4403..fe386211bf0 100644
--- a/src/core/lib/security/transport/auth_filters.h
+++ b/src/core/lib/security/transport/auth_filters.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H
 #define GRPC_SRC_CORE_LIB_SECURITY_TRANSPORT_AUTH_FILTERS_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/security/transport/client_auth_filter.cc b/src/core/lib/security/transport/client_auth_filter.cc
index a5740afcfa2..557f6b14450 100644
--- a/src/core/lib/security/transport/client_auth_filter.cc
+++ b/src/core/lib/security/transport/client_auth_filter.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <functional>
@@ -25,14 +31,6 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/security/transport/server_auth_filter.cc b/src/core/lib/security/transport/server_auth_filter.cc
index 45e47aaa214..240e7c9d482 100644
--- a/src/core/lib/security/transport/server_auth_filter.cc
+++ b/src/core/lib/security/transport/server_auth_filter.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 #include <cstddef>
@@ -27,14 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/security/util/json_util.cc b/src/core/lib/security/util/json_util.cc
index c0b5a5b36cc..2cbc8ec7574 100644
--- a/src/core/lib/security/util/json_util.cc
+++ b/src/core/lib/security/util/json_util.cc
@@ -18,16 +18,15 @@
 
 #include "src/core/lib/security/util/json_util.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <map>
 #include <string>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/error.h"
 
 const char* grpc_json_get_string_property(const grpc_core::Json& json,
diff --git a/src/core/lib/slice/percent_encoding.cc b/src/core/lib/slice/percent_encoding.cc
index 8b51c4d9059..88af7e0a20f 100644
--- a/src/core/lib/slice/percent_encoding.cc
+++ b/src/core/lib/slice/percent_encoding.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/slice/percent_encoding.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <cstdint>
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/bitset.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc
index a7ff2198d03..52af6a4e288 100644
--- a/src/core/lib/slice/slice.cc
+++ b/src/core/lib/slice/slice.cc
@@ -18,16 +18,14 @@
 
 #include "src/core/lib/slice/slice.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <new>
 
 #include "absl/log/check.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 #include "src/core/util/memory.h"
diff --git a/src/core/lib/slice/slice.h b/src/core/lib/slice/slice.h
index 5b70fa4ee52..6a84345d838 100644
--- a/src/core/lib/slice/slice.h
+++ b/src/core/lib/slice/slice.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_H
 
+#include <grpc/event_engine/internal/slice_cast.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,12 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/internal/slice_cast.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 #include "src/core/util/debug_location.h"
diff --git a/src/core/lib/slice/slice_buffer.cc b/src/core/lib/slice/slice_buffer.cc
index 3d07c32334b..37be00ec16c 100644
--- a/src/core/lib/slice/slice_buffer.cc
+++ b/src/core/lib/slice/slice_buffer.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/slice/slice_buffer.h"
 
-#include <string.h>
-
-#include <utility>
-
-#include "absl/log/check.h"
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include <utility>
+
+#include "absl/log/check.h"
 #include "src/core/lib/slice/slice_internal.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/slice/slice_buffer.h b/src/core/lib/slice/slice_buffer.h
index cfd6d53a3bc..ab6c19d4f55 100644
--- a/src/core/lib/slice/slice_buffer.h
+++ b/src/core/lib/slice/slice_buffer.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_BUFFER_H
 
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 #include <string>
 
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 
 // Copy the first n bytes of src into memory pointed to by dst.
diff --git a/src/core/lib/slice/slice_internal.h b/src/core/lib/slice/slice_internal.h
index 093a77ecfb0..9c05f6fdacd 100644
--- a/src/core/lib/slice/slice_internal.h
+++ b/src/core/lib/slice/slice_internal.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_INTERNAL_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstddef>
@@ -27,10 +29,6 @@
 #include "absl/hash/hash.h"
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/memory.h"
 
 // Returns a pointer to the first slice in the slice buffer without giving
diff --git a/src/core/lib/slice/slice_refcount.h b/src/core/lib/slice/slice_refcount.h
index c27bb07a8e7..7ee670114a9 100644
--- a/src/core/lib/slice/slice_refcount.h
+++ b/src/core/lib/slice/slice_refcount.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_REFCOUNT_H
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
 #include <atomic>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/debug_location.h"
 
diff --git a/src/core/lib/slice/slice_string_helpers.h b/src/core/lib/slice/slice_string_helpers.h
index 94680e64c20..ea5805e99a0 100644
--- a/src/core/lib/slice/slice_string_helpers.h
+++ b/src/core/lib/slice/slice_string_helpers.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H
 #define GRPC_SRC_CORE_LIB_SLICE_SLICE_STRING_HELPERS_H
 
-#include <stdint.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 // Calls gpr_dump on a slice.
 char* grpc_dump_slice(const grpc_slice& slice, uint32_t flags);
diff --git a/src/core/lib/surface/byte_buffer.cc b/src/core/lib/surface/byte_buffer.cc
index 06e45623332..3a5b5666832 100644
--- a/src/core/lib/surface/byte_buffer.cc
+++ b/src/core/lib/surface/byte_buffer.cc
@@ -16,8 +16,6 @@
 //
 //
 
-#include <stddef.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
@@ -25,6 +23,7 @@
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/core/lib/surface/byte_buffer_reader.cc b/src/core/lib/surface/byte_buffer_reader.cc
index 0516b852a90..52bf3795c90 100644
--- a/src/core/lib/surface/byte_buffer_reader.cc
+++ b/src/core/lib/surface/byte_buffer_reader.cc
@@ -16,17 +16,15 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index 29c4277d284..95f42cf41f8 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -18,6 +18,19 @@
 
 #include "src/core/lib/surface/call.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -42,21 +55,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h
index 8c225b7379d..e95d3686663 100644
--- a/src/core/lib/surface/call.h
+++ b/src/core/lib/surface/call.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CALL_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,12 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/compression_types.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/surface/call_log_batch.cc b/src/core/lib/surface/call_log_batch.cc
index 4f6ec2153b6..2162ac2831b 100644
--- a/src/core/lib/surface/call_log_batch.cc
+++ b/src/core/lib/surface/call_log_batch.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -25,11 +28,6 @@
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/lib/surface/call_test_only.h b/src/core/lib/surface/call_test_only.h
index 2b1f98b1102..217f5dfc40e 100644
--- a/src/core/lib/surface/call_test_only.h
+++ b/src/core/lib/surface/call_test_only.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CALL_TEST_ONLY_H
 
-#include <stdint.h>
-
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 /// Return the message compression algorithm from \a call.
 ///
diff --git a/src/core/lib/surface/call_utils.cc b/src/core/lib/surface/call_utils.cc
index 18a78fb284e..e5949d9d200 100644
--- a/src/core/lib/surface/call_utils.cc
+++ b/src/core/lib/surface/call_utils.cc
@@ -14,6 +14,19 @@
 
 #include "src/core/lib/surface/call_utils.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -33,21 +46,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/src/core/lib/surface/call_utils.h b/src/core/lib/surface/call_utils.h
index de9c928fa74..269e2f25178 100644
--- a/src/core/lib/surface/call_utils.h
+++ b/src/core/lib/surface/call_utils.h
@@ -15,6 +15,19 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CALL_UTILS_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CALL_UTILS_H
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -31,21 +44,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
index 577ab734efa..df13bf3e37b 100644
--- a/src/core/lib/surface/channel.cc
+++ b/src/core/lib/surface/channel.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/lib/surface/channel.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h
index fa8ac5468c8..f5105257ab4 100644
--- a/src/core/lib/surface/channel.h
+++ b/src/core/lib/surface/channel.h
@@ -17,6 +17,12 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/compression_types.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <map>
 #include <string>
 
@@ -24,13 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/compression_types.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/lib/surface/channel_create.cc b/src/core/lib/surface/channel_create.cc
index ef0fd5ba2c6..d8a243ceb27 100644
--- a/src/core/lib/surface/channel_create.cc
+++ b/src/core/lib/surface/channel_create.cc
@@ -16,12 +16,11 @@
 
 #include "src/core/lib/surface/channel_create.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/client_channel/direct_channel.h"
diff --git a/src/core/lib/surface/channel_create.h b/src/core/lib/surface/channel_create.h
index 0295eb92bc3..187748cc2a3 100644
--- a/src/core/lib/surface/channel_create.h
+++ b/src/core/lib/surface/channel_create.h
@@ -17,12 +17,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_CREATE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/channel_stack_type.h"
diff --git a/src/core/lib/surface/channel_init.cc b/src/core/lib/surface/channel_init.cc
index cebe053e34d..28d04651950 100644
--- a/src/core/lib/surface/channel_init.cc
+++ b/src/core/lib/surface/channel_init.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/surface/channel_init.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -33,9 +34,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/surface/channel_stack_type.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h
index 628620228c5..7374c880a96 100644
--- a/src/core/lib/surface/channel_init.h
+++ b/src/core/lib/surface/channel_init.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CHANNEL_INIT_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <initializer_list>
@@ -29,9 +30,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
diff --git a/src/core/lib/surface/client_call.cc b/src/core/lib/surface/client_call.cc
index 05670b2e1bc..7f96a43b8aa 100644
--- a/src/core/lib/surface/client_call.cc
+++ b/src/core/lib/surface/client_call.cc
@@ -14,6 +14,19 @@
 
 #include "src/core/lib/surface/client_call.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -29,21 +42,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/promise/all_ok.h"
 #include "src/core/lib/promise/status_flag.h"
diff --git a/src/core/lib/surface/client_call.h b/src/core/lib/surface/client_call.h
index 8180c273ba2..d2f86e93d9d 100644
--- a/src/core/lib/surface/client_call.h
+++ b/src/core/lib/surface/client_call.h
@@ -15,19 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_CLIENT_CALL_H
 
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <atomic>
-#include <cstdint>
-#include <string>
-
-#include "absl/status/status.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
@@ -41,7 +28,18 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atomic>
+#include <cstdint>
+#include <string>
 
+#include "absl/status/status.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/promise/status_flag.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/lib/surface/completion_queue.cc b/src/core/lib/surface/completion_queue.cc
index 9d958defc98..5f25576771d 100644
--- a/src/core/lib/surface/completion_queue.cc
+++ b/src/core/lib/surface/completion_queue.cc
@@ -17,6 +17,12 @@
 //
 #include "src/core/lib/surface/completion_queue.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -32,14 +38,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h
index 33dcb5ed5c1..5b8a634ddb0 100644
--- a/src/core/lib/surface/completion_queue.h
+++ b/src/core/lib/surface/completion_queue.h
@@ -21,10 +21,9 @@
 
 // Internal API for completion queues
 
-#include <stdint.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/lib/surface/completion_queue_factory.cc b/src/core/lib/surface/completion_queue_factory.cc
index dae6695b712..c88360772aa 100644
--- a/src/core/lib/surface/completion_queue_factory.cc
+++ b/src/core/lib/surface/completion_queue_factory.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/lib/surface/completion_queue_factory.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 
diff --git a/src/core/lib/surface/event_string.cc b/src/core/lib/surface/event_string.cc
index eafe18918f5..f0398ba2532 100644
--- a/src/core/lib/surface/event_string.cc
+++ b/src/core/lib/surface/event_string.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/surface/event_string.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/port_platform.h>
-
 static void addhdr(grpc_event* ev, std::vector<std::string>* buf) {
   buf->push_back(absl::StrFormat("tag:%p", ev->tag));
 }
diff --git a/src/core/lib/surface/event_string.h b/src/core/lib/surface/event_string.h
index 9677aa84f64..d5709e76451 100644
--- a/src/core/lib/surface/event_string.h
+++ b/src/core/lib/surface/event_string.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
 #define GRPC_SRC_CORE_LIB_SURFACE_EVENT_STRING_H
 
-#include <string>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 // Returns a string describing an event. Must be later freed with gpr_free()
 std::string grpc_event_string(grpc_event* ev);
 
diff --git a/src/core/lib/surface/filter_stack_call.cc b/src/core/lib/surface/filter_stack_call.cc
index 707d99a59fa..dc6ee088c29 100644
--- a/src/core/lib/surface/filter_stack_call.cc
+++ b/src/core/lib/surface/filter_stack_call.cc
@@ -14,6 +14,19 @@
 
 #include "src/core/lib/surface/filter_stack_call.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -29,21 +42,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/src/core/lib/surface/filter_stack_call.h b/src/core/lib/surface/filter_stack_call.h
index b4c304773c9..d9a8866d5e4 100644
--- a/src/core/lib/surface/filter_stack_call.h
+++ b/src/core/lib/surface/filter_stack_call.h
@@ -15,21 +15,6 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_FILTER_STACK_CALL_H
 
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <atomic>
-#include <cstdint>
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
@@ -43,7 +28,20 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <atomic>
+#include <cstdint>
+#include <string>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc
index 233f6f97d16..3e2aae160ad 100644
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@@ -18,11 +18,6 @@
 
 #include "src/core/lib/surface/init.h"
 
-#include "absl/base/thread_annotations.h"
-#include "absl/log/log.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
-
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
@@ -31,6 +26,10 @@
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/log.h"
+#include "absl/time/clock.h"
+#include "absl/time/time.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/lib/surface/init.h b/src/core/lib/surface/init.h
index 804b79c5d5b..9f9a4a46880 100644
--- a/src/core/lib/surface/init.h
+++ b/src/core/lib/surface/init.h
@@ -18,10 +18,10 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_INIT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_INIT_H
 
-#include "absl/time/time.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/time/time.h"
+
 void grpc_maybe_wait_for_async_shutdown(void);
 
 // Returns false if the timeout expired before fully shut down.
diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc
index 8acfd80986d..64030cfbbe8 100644
--- a/src/core/lib/surface/lame_client.cc
+++ b/src/core/lib/surface/lame_client.cc
@@ -18,17 +18,16 @@
 
 #include "src/core/lib/surface/lame_client.h"
 
-#include <memory>
-#include <utility>
-
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/src/core/lib/surface/lame_client.h b/src/core/lib/surface/lame_client.h
index 970c7630c48..85c4c6e2992 100644
--- a/src/core/lib/surface/lame_client.h
+++ b/src/core/lib/surface/lame_client.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
 #define GRPC_SRC_CORE_LIB_SURFACE_LAME_CLIENT_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/lib/surface/legacy_channel.cc b/src/core/lib/surface/legacy_channel.cc
index ba306525f2c..ba9826e5118 100644
--- a/src/core/lib/surface/legacy_channel.cc
+++ b/src/core/lib/surface/legacy_channel.cc
@@ -18,18 +18,17 @@
 
 #include "src/core/lib/surface/legacy_channel.h"
 
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/types/optional.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/lib/surface/legacy_channel.h b/src/core/lib/surface/legacy_channel.h
index 7ca47a6bb22..ee1c3f92c89 100644
--- a/src/core/lib/surface/legacy_channel.h
+++ b/src/core/lib/surface/legacy_channel.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_LEGACY_CHANNEL_H
 
-#include <string>
-
-#include "absl/status/statusor.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/lib/surface/metadata_array.cc b/src/core/lib/surface/metadata_array.cc
index 666459e6e0a..ba3e8a36460 100644
--- a/src/core/lib/surface/metadata_array.cc
+++ b/src/core/lib/surface/metadata_array.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 #include "src/core/lib/debug/trace.h"
 
diff --git a/src/core/lib/surface/server_call.cc b/src/core/lib/surface/server_call.cc
index 32aadc25da9..ed1d0bb8426 100644
--- a/src/core/lib/surface/server_call.cc
+++ b/src/core/lib/surface/server_call.cc
@@ -14,18 +14,6 @@
 
 #include "src/core/lib/surface/server_call.h"
 
-#include <inttypes.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/compression.h>
 #include <grpc/event_engine/event_engine.h>
@@ -39,7 +27,17 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/promise/all_ok.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/surface/server_call.h b/src/core/lib/surface/server_call.h
index dcc9d86606e..a69673adc55 100644
--- a/src/core/lib/surface/server_call.h
+++ b/src/core/lib/surface/server_call.h
@@ -15,6 +15,19 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H
 #define GRPC_SRC_CORE_LIB_SURFACE_SERVER_CALL_H
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/call.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -30,21 +43,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/call.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
diff --git a/src/core/lib/surface/validate_metadata.cc b/src/core/lib/surface/validate_metadata.cc
index 3a68a673c04..684cad74e53 100644
--- a/src/core/lib/surface/validate_metadata.cc
+++ b/src/core/lib/surface/validate_metadata.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/surface/validate_metadata.h"
 
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/bitset.h"
diff --git a/src/core/lib/surface/validate_metadata.h b/src/core/lib/surface/validate_metadata.h
index 03d08939894..f4630ea2d48 100644
--- a/src/core/lib/surface/validate_metadata.h
+++ b/src/core/lib/surface/validate_metadata.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H
 #define GRPC_SRC_CORE_LIB_SURFACE_VALIDATE_METADATA_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <cstring>
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/transport/bdp_estimator.cc b/src/core/lib/transport/bdp_estimator.cc
index ed2176bea61..90d7cf9429c 100644
--- a/src/core/lib/transport/bdp_estimator.cc
+++ b/src/core/lib/transport/bdp_estimator.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/transport/bdp_estimator.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -26,8 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 BdpEstimator::BdpEstimator(absl::string_view name)
diff --git a/src/core/lib/transport/bdp_estimator.h b/src/core/lib/transport/bdp_estimator.h
index 487b04eb35d..c5879d939c3 100644
--- a/src/core/lib/transport/bdp_estimator.h
+++ b/src/core/lib/transport/bdp_estimator.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_BDP_ESTIMATOR_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 
 #include <string>
@@ -26,10 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/lib/transport/call_arena_allocator.cc b/src/core/lib/transport/call_arena_allocator.cc
index 729b9fe51bb..a9b15cda290 100644
--- a/src/core/lib/transport/call_arena_allocator.cc
+++ b/src/core/lib/transport/call_arena_allocator.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/transport/call_arena_allocator.h"
 
-#include <algorithm>
-
 #include <grpc/support/port_platform.h>
 
+#include <algorithm>
+
 namespace grpc_core {
 
 void CallArenaAllocator::FinalizeArena(Arena* arena) {
diff --git a/src/core/lib/transport/call_arena_allocator.h b/src/core/lib/transport/call_arena_allocator.h
index d52bdf4ecf7..074f9a15772 100644
--- a/src/core/lib/transport/call_arena_allocator.h
+++ b/src/core/lib/transport/call_arena_allocator.h
@@ -15,13 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_ARENA_ALLOCATOR_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_ARENA_ALLOCATOR_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
 #include <cstddef>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/lib/transport/call_filters.cc b/src/core/lib/transport/call_filters.cc
index 822c266b0b3..a4d945f8067 100644
--- a/src/core/lib/transport/call_filters.cc
+++ b/src/core/lib/transport/call_filters.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/lib/transport/call_filters.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/util/crash.h"
 
diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h
index 01d4c7614de..3dabd20e2f6 100644
--- a/src/core/lib/transport/call_filters.h
+++ b/src/core/lib/transport/call_filters.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FILTERS_H
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <limits>
 #include <memory>
@@ -22,9 +24,6 @@
 #include <type_traits>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/latch.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/lib/transport/call_final_info.cc b/src/core/lib/transport/call_final_info.cc
index e5bf3a5a8a9..5808135551d 100644
--- a/src/core/lib/transport/call_final_info.cc
+++ b/src/core/lib/transport/call_final_info.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/transport/call_final_info.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 static void move64bits(uint64_t* from, uint64_t* to) {
   *to += *from;
   *from = 0;
diff --git a/src/core/lib/transport/call_final_info.h b/src/core/lib/transport/call_final_info.h
index fd407df6de8..2182e9df6b6 100644
--- a/src/core/lib/transport/call_final_info.h
+++ b/src/core/lib/transport/call_final_info.h
@@ -15,12 +15,12 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_FINAL_INFO_H
 
-#include <cstdint>
-
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
+#include <cstdint>
+
 struct grpc_transport_one_way_stats {
   uint64_t framing_bytes = 0;
   uint64_t data_bytes = 0;
diff --git a/src/core/lib/transport/call_spine.cc b/src/core/lib/transport/call_spine.cc
index 29cca71f9a1..93831a87b98 100644
--- a/src/core/lib/transport/call_spine.cc
+++ b/src/core/lib/transport/call_spine.cc
@@ -14,10 +14,9 @@
 
 #include "src/core/lib/transport/call_spine.h"
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/promise/for_each.h"
 #include "src/core/lib/promise/try_seq.h"
diff --git a/src/core/lib/transport/call_spine.h b/src/core/lib/transport/call_spine.h
index c3d5687b971..a962c308f69 100644
--- a/src/core/lib/transport/call_spine.h
+++ b/src/core/lib/transport/call_spine.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_SPINE_H
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/promise/detail/status.h"
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/latch.h"
diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h
index 33eca5e66b4..1c58a9d61a5 100644
--- a/src/core/lib/transport/call_state.h
+++ b/src/core/lib/transport/call_state.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CALL_STATE_H
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/transport/connectivity_state.cc b/src/core/lib/transport/connectivity_state.cc
index 9239f34f2be..126f4d2535d 100644
--- a/src/core/lib/transport/connectivity_state.cc
+++ b/src/core/lib/transport/connectivity_state.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/lib/transport/connectivity_state.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/transport/connectivity_state.h b/src/core/lib/transport/connectivity_state.h
index a986c66e9f5..91e64aae485 100644
--- a/src/core/lib/transport/connectivity_state.h
+++ b/src/core/lib/transport/connectivity_state.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_CONNECTIVITY_STATE_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/work_serializer.h"
diff --git a/src/core/lib/transport/error_utils.cc b/src/core/lib/transport/error_utils.cc
index 4a59efe3deb..ce28fa82c0a 100644
--- a/src/core/lib/transport/error_utils.cc
+++ b/src/core/lib/transport/error_utils.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/transport/error_utils.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdint.h>
 
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/util/status_helper.h"
 
diff --git a/src/core/lib/transport/error_utils.h b/src/core/lib/transport/error_utils.h
index 9510081d004..2abbe7a6f4c 100644
--- a/src/core/lib/transport/error_utils.h
+++ b/src/core/lib/transport/error_utils.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_ERROR_UTILS_H
 
-#include <string>
-
-#include "absl/status/status.h"
-
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/status/status.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/transport/http2_errors.h"
 #include "src/core/util/time.h"
diff --git a/src/core/lib/transport/interception_chain.cc b/src/core/lib/transport/interception_chain.cc
index 317c6cfa93a..14d8c83f793 100644
--- a/src/core/lib/transport/interception_chain.cc
+++ b/src/core/lib/transport/interception_chain.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/lib/transport/interception_chain.h"
 
-#include <cstddef>
-
 #include <grpc/support/port_platform.h>
 
+#include <cstddef>
+
 #include "src/core/lib/transport/call_destination.h"
 #include "src/core/lib/transport/call_filters.h"
 #include "src/core/lib/transport/call_spine.h"
diff --git a/src/core/lib/transport/interception_chain.h b/src/core/lib/transport/interception_chain.h
index a204985afc0..db54104dafa 100644
--- a/src/core/lib/transport/interception_chain.h
+++ b/src/core/lib/transport/interception_chain.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_INTERCEPTION_CHAIN_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/call_destination.h"
 #include "src/core/lib/transport/call_filters.h"
 #include "src/core/lib/transport/call_spine.h"
diff --git a/src/core/lib/transport/message.cc b/src/core/lib/transport/message.cc
index a9435911a57..30f1a3088bb 100644
--- a/src/core/lib/transport/message.cc
+++ b/src/core/lib/transport/message.cc
@@ -14,11 +14,11 @@
 
 #include "src/core/lib/transport/message.h"
 
-#include "absl/strings/str_cat.h"
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/str_cat.h"
+
 namespace grpc_core {
 
 std::string Message::DebugString() const {
diff --git a/src/core/lib/transport/metadata_batch.cc b/src/core/lib/transport/metadata_batch.cc
index 732a17e11ca..6dcbc0ace2b 100644
--- a/src/core/lib/transport/metadata_batch.cc
+++ b/src/core/lib/transport/metadata_batch.cc
@@ -14,6 +14,7 @@
 
 #include "src/core/lib/transport/metadata_batch.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/timeout_encoding.h"
 
 namespace grpc_core {
diff --git a/src/core/lib/transport/metadata_batch.h b/src/core/lib/transport/metadata_batch.h
index 4a2ca21bd27..005139af20b 100644
--- a/src/core/lib/transport/metadata_batch.h
+++ b/src/core/lib/transport/metadata_batch.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_BATCH_H
 
+#include <grpc/impl/compression_types.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <cstdint>
@@ -33,11 +36,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/compression_types.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/compression/compression_internal.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/poll.h"
diff --git a/src/core/lib/transport/metadata_compression_traits.h b/src/core/lib/transport/metadata_compression_traits.h
index 05f8a9145f8..baa7e0ee906 100644
--- a/src/core/lib/transport/metadata_compression_traits.h
+++ b/src/core/lib/transport/metadata_compression_traits.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_METADATA_COMPRESSION_TRAITS_H
 
-#include <stddef.h>
-
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
 namespace grpc_core {
 
diff --git a/src/core/lib/transport/parsed_metadata.h b/src/core/lib/transport/parsed_metadata.h
index 1ea9c9a2e4a..ac529c2e609 100644
--- a/src/core/lib/transport/parsed_metadata.h
+++ b/src/core/lib/transport/parsed_metadata.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_PARSED_METADATA_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <cstdint>
@@ -28,10 +30,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/lib/transport/promise_endpoint.cc b/src/core/lib/transport/promise_endpoint.cc
index 90b2e0ce5b8..b151388587f 100644
--- a/src/core/lib/transport/promise_endpoint.cc
+++ b/src/core/lib/transport/promise_endpoint.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/lib/transport/promise_endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <functional>
 #include <memory>
@@ -22,12 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h
index 0e69b82f7a1..18af1a763c4 100644
--- a/src/core/lib/transport/promise_endpoint.h
+++ b/src/core/lib/transport/promise_endpoint.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_PROMISE_ENDPOINT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -29,13 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/extensions/chaotic_good_extension.h"
 #include "src/core/lib/event_engine/query_extensions.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/lib/transport/simple_slice_based_metadata.h b/src/core/lib/transport/simple_slice_based_metadata.h
index 01270a645c3..eed4ec06241 100644
--- a/src/core/lib/transport/simple_slice_based_metadata.h
+++ b/src/core/lib/transport/simple_slice_based_metadata.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_SIMPLE_SLICE_BASED_METADATA_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/parsed_metadata.h"
 
diff --git a/src/core/lib/transport/timeout_encoding.cc b/src/core/lib/transport/timeout_encoding.cc
index 57621d835c0..845dbf7a26f 100644
--- a/src/core/lib/transport/timeout_encoding.cc
+++ b/src/core/lib/transport/timeout_encoding.cc
@@ -18,14 +18,14 @@
 
 #include "src/core/lib/transport/timeout_encoding.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <limits>
 
 #include "absl/base/attributes.h"
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h
index 9957640a95b..995650bc5b6 100644
--- a/src/core/lib/transport/timeout_encoding.h
+++ b/src/core/lib/transport/timeout_encoding.h
@@ -19,12 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_TIMEOUT_ENCODING_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
index 58d0869cf7e..fb189ff168e 100644
--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/transport/transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -26,11 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/for_each.h"
diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h
index 9c34fb1efce..e0ed8b07d3c 100644
--- a/src/core/lib/transport/transport.h
+++ b/src/core/lib/transport/transport.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H
 #define GRPC_SRC_CORE_LIB_TRANSPORT_TRANSPORT_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
@@ -32,13 +37,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/call_combiner.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/core/lib/transport/transport_op_string.cc b/src/core/lib/transport/transport_op_string.cc
index 7141161ed08..08b5e4656b6 100644
--- a/src/core/lib/transport/transport_op_string.cc
+++ b/src/core/lib/transport/transport_op_string.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/connectivity_state.h"
diff --git a/src/core/load_balancing/.clang-format b/src/core/load_balancing/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/load_balancing/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/load_balancing/address_filtering.cc b/src/core/load_balancing/address_filtering.cc
index fe9834b170d..1a19cfca33a 100644
--- a/src/core/load_balancing/address_filtering.cc
+++ b/src/core/load_balancing/address_filtering.cc
@@ -16,14 +16,12 @@
 
 #include "src/core/load_balancing/address_filtering.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <utility>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/load_balancing/address_filtering.h b/src/core/load_balancing/address_filtering.h
index 7b7fda9ac74..31b45108285 100644
--- a/src/core/load_balancing/address_filtering.h
+++ b/src/core/load_balancing/address_filtering.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_ADDRESS_FILTERING_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
@@ -24,9 +26,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_string.h"
diff --git a/src/core/load_balancing/backend_metric_data.h b/src/core/load_balancing/backend_metric_data.h
index 1f11e61e947..036298681de 100644
--- a/src/core/load_balancing/backend_metric_data.h
+++ b/src/core/load_balancing/backend_metric_data.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_DATA_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Represents backend metrics reported by the backend to the client.
diff --git a/src/core/load_balancing/backend_metric_parser.cc b/src/core/load_balancing/backend_metric_parser.cc
index 6dc1275a65e..3b65399136a 100644
--- a/src/core/load_balancing/backend_metric_parser.cc
+++ b/src/core/load_balancing/backend_metric_parser.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/load_balancing/backend_metric_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <map>
@@ -26,8 +27,6 @@
 #include "upb/message/map.h"
 #include "xds/data/orca/v3/orca_load_report.upb.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/load_balancing/backend_metric_parser.h b/src/core/load_balancing/backend_metric_parser.h
index cd499157d0a..c6bf0b08729 100644
--- a/src/core/load_balancing/backend_metric_parser.h
+++ b/src/core/load_balancing/backend_metric_parser.h
@@ -17,12 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_BACKEND_METRIC_PARSER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/backend_metric_data.h"
 
 namespace grpc_core {
diff --git a/src/core/load_balancing/child_policy_handler.cc b/src/core/load_balancing/child_policy_handler.cc
index 4ec9127b555..5f6b545af9d 100644
--- a/src/core/load_balancing/child_policy_handler.cc
+++ b/src/core/load_balancing/child_policy_handler.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/child_policy_handler.h"
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
@@ -24,10 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/src/core/load_balancing/child_policy_handler.h b/src/core/load_balancing/child_policy_handler.h
index 79b056a4070..e22da5cb322 100644
--- a/src/core/load_balancing/child_policy_handler.h
+++ b/src/core/load_balancing/child_policy_handler.h
@@ -16,13 +16,12 @@
 
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_CHILD_POLICY_HANDLER_H
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/load_balancing/delegating_helper.h b/src/core/load_balancing/delegating_helper.h
index 0852319d8a9..c504797b526 100644
--- a/src/core/load_balancing/delegating_helper.h
+++ b/src/core/load_balancing/delegating_helper.h
@@ -17,16 +17,15 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_DELEGATING_HELPER_H
 
-#include <utility>
-
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/src/core/load_balancing/endpoint_list.cc b/src/core/load_balancing/endpoint_list.cc
index 7507aadc5b5..93161132732 100644
--- a/src/core/load_balancing/endpoint_list.cc
+++ b/src/core/load_balancing/endpoint_list.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/endpoint_list.h"
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -27,11 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/src/core/load_balancing/endpoint_list.h b/src/core/load_balancing/endpoint_list.h
index eff8663d7e8..4ba3b60753a 100644
--- a/src/core/load_balancing/endpoint_list.h
+++ b/src/core/load_balancing/endpoint_list.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_ENDPOINT_LIST_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 #include "absl/functional/function_ref.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
index 4aff5f14580..90b12f05101 100644
--- a/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
+++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/load_balancing/grpclb/client_load_reporting_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/map.h"
diff --git a/src/core/load_balancing/grpclb/client_load_reporting_filter.h b/src/core/load_balancing/grpclb/client_load_reporting_filter.h
index 87fa1fee21b..07e0c43b8c2 100644
--- a/src/core/load_balancing/grpclb/client_load_reporting_filter.h
+++ b/src/core/load_balancing/grpclb/client_load_reporting_filter.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_CLIENT_LOAD_REPORTING_FILTER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/core/load_balancing/grpclb/grpclb.cc b/src/core/load_balancing/grpclb/grpclb.cc
index d6e82fbb134..a214f92c4db 100644
--- a/src/core/load_balancing/grpclb/grpclb.cc
+++ b/src/core/load_balancing/grpclb/grpclb.cc
@@ -58,6 +58,14 @@
 
 // IWYU pragma: no_include <sys/socket.h>
 
+#include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -83,17 +91,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
@@ -144,6 +141,7 @@
 #include "src/core/util/useful.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/util/work_serializer.h"
+#include "upb/mem/arena.hpp"
 
 #define GRPC_GRPCLB_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_GRPCLB_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc
index a0552c57c70..85b8ff6d6c6 100644
--- a/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc
+++ b/src/core/load_balancing/grpclb/grpclb_balancer_addresses.cc
@@ -16,12 +16,11 @@
 
 #include "src/core/load_balancing/grpclb/grpclb_balancer_addresses.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.cc b/src/core/load_balancing/grpclb/grpclb_client_stats.cc
index 6ed75719e9c..2f9f0a9842d 100644
--- a/src/core/load_balancing/grpclb/grpclb_client_stats.cc
+++ b/src/core/load_balancing/grpclb/grpclb_client_stats.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
 
-#include <string.h>
-
 #include <grpc/support/atm.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
 
 #include "src/core/util/sync.h"
 
diff --git a/src/core/load_balancing/grpclb/grpclb_client_stats.h b/src/core/load_balancing/grpclb/grpclb_client_stats.h
index d03462038f6..332f942fe52 100644
--- a/src/core/load_balancing/grpclb/grpclb_client_stats.h
+++ b/src/core/load_balancing/grpclb/grpclb_client_stats.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_GRPCLB_CLIENT_STATS_H
 
+#include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/container/inlined_vector.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/memory.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/load_balancing/grpclb/load_balancer_api.cc b/src/core/load_balancing/grpclb/load_balancer_api.cc
index 8cda3230ed5..6fd1eafd9ff 100644
--- a/src/core/load_balancing/grpclb/load_balancer_api.cc
+++ b/src/core/load_balancing/grpclb/load_balancer_api.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/load_balancing/grpclb/load_balancer_api.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -25,13 +27,9 @@
 #include "absl/log/log.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/timestamp.upb.h"
-#include "upb/base/string_view.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/memory.h"
 #include "src/proto/grpc/lb/v1/load_balancer.upb.h"
+#include "upb/base/string_view.h"
 
 namespace grpc_core {
 
diff --git a/src/core/load_balancing/grpclb/load_balancer_api.h b/src/core/load_balancing/grpclb/load_balancer_api.h
index ebfdd0c84d6..c2aa2db7713 100644
--- a/src/core/load_balancing/grpclb/load_balancer_api.h
+++ b/src/core/load_balancing/grpclb/load_balancer_api.h
@@ -18,18 +18,16 @@
 
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_GRPCLB_LOAD_BALANCER_API_H
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "absl/strings/string_view.h"
-#include "upb/mem/arena.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/grpclb/grpclb_client_stats.h"
 #include "src/core/util/time.h"
+#include "upb/mem/arena.h"
 
 #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128
 #define GRPC_GRPCLB_SERVER_IP_ADDRESS_MAX_SIZE 16
diff --git a/src/core/load_balancing/health_check_client.cc b/src/core/load_balancing/health_check_client.cc
index b2d3f1ac3a9..0f28c4392ae 100644
--- a/src/core/load_balancing/health_check_client.cc
+++ b/src/core/load_balancing/health_check_client.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -31,15 +36,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/subchannel.h"
@@ -62,6 +58,8 @@
 #include "src/core/util/sync.h"
 #include "src/core/util/work_serializer.h"
 #include "src/proto/grpc/health/v1/health.upb.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/load_balancing/health_check_client.h b/src/core/load_balancing/health_check_client.h
index 9fe4c1cdf17..abe778f503d 100644
--- a/src/core/load_balancing/health_check_client.h
+++ b/src/core/load_balancing/health_check_client.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/util/work_serializer.h"
diff --git a/src/core/load_balancing/health_check_client_internal.h b/src/core/load_balancing/health_check_client_internal.h
index cded2e1df8c..187b3dec0fe 100644
--- a/src/core/load_balancing/health_check_client_internal.h
+++ b/src/core/load_balancing/health_check_client_internal.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_HEALTH_CHECK_CLIENT_INTERNAL_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <set>
@@ -27,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
diff --git a/src/core/load_balancing/lb_policy.h b/src/core/load_balancing/lb_policy.h
index bbfd775b028..d8116d8cb7a 100644
--- a/src/core/load_balancing/lb_policy.h
+++ b/src/core/load_balancing/lb_policy.h
@@ -17,6 +17,11 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,13 +36,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/load_balancing/lb_policy_factory.h b/src/core/load_balancing/lb_policy_factory.h
index d05d356b71d..c8b710b1247 100644
--- a/src/core/load_balancing/lb_policy_factory.h
+++ b/src/core/load_balancing/lb_policy_factory.h
@@ -17,11 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_FACTORY_H
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/load_balancing/lb_policy_registry.cc b/src/core/load_balancing/lb_policy_registry.cc
index 1aaa2103941..b0b20139f76 100644
--- a/src/core/load_balancing/lb_policy_registry.cc
+++ b/src/core/load_balancing/lb_policy_registry.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/lb_policy_registry.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <map>
 #include <string>
@@ -29,10 +32,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/lb_policy.h"
 
 namespace grpc_core {
diff --git a/src/core/load_balancing/lb_policy_registry.h b/src/core/load_balancing/lb_policy_registry.h
index e0587f4856a..86bc7ccd2eb 100644
--- a/src/core/load_balancing/lb_policy_registry.h
+++ b/src/core/load_balancing/lb_policy_registry.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_LB_POLICY_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/load_balancing/oob_backend_metric.cc b/src/core/load_balancing/oob_backend_metric.cc
index 87e9528379e..4b29bd25847 100644
--- a/src/core/load_balancing/oob_backend_metric.cc
+++ b/src/core/load_balancing/oob_backend_metric.cc
@@ -16,6 +16,12 @@
 
 #include "src/core/load_balancing/oob_backend_metric.h"
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -28,16 +34,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/duration.upb.h"
-#include "upb/mem/arena.hpp"
-#include "xds/service/orca/v3/orca.upb.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
@@ -56,6 +52,8 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time.h"
+#include "upb/mem/arena.hpp"
+#include "xds/service/orca/v3/orca.upb.h"
 
 namespace grpc_core {
 
diff --git a/src/core/load_balancing/oob_backend_metric.h b/src/core/load_balancing/oob_backend_metric.h
index 1c594d8e93c..1eacc08e54d 100644
--- a/src/core/load_balancing/oob_backend_metric.h
+++ b/src/core/load_balancing/oob_backend_metric.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/subchannel_interface.h"
 #include "src/core/util/time.h"
diff --git a/src/core/load_balancing/oob_backend_metric_internal.h b/src/core/load_balancing/oob_backend_metric_internal.h
index f39e852b01f..647f45d7eaa 100644
--- a/src/core/load_balancing/oob_backend_metric_internal.h
+++ b/src/core/load_balancing/oob_backend_metric_internal.h
@@ -17,16 +17,15 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OOB_BACKEND_METRIC_INTERNAL_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <set>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/client_channel/subchannel_stream_client.h"
diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.cc b/src/core/load_balancing/outlier_detection/outlier_detection.cc
index aef81b7363d..448f3da2271 100644
--- a/src/core/load_balancing/outlier_detection/outlier_detection.cc
+++ b/src/core/load_balancing/outlier_detection/outlier_detection.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -39,11 +42,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/load_balancing/outlier_detection/outlier_detection.h b/src/core/load_balancing/outlier_detection/outlier_detection.h
index d862941e1fa..c035e45c165 100644
--- a/src/core/load_balancing/outlier_detection/outlier_detection.h
+++ b/src/core/load_balancing/outlier_detection/outlier_detection.h
@@ -17,12 +17,10 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_OUTLIER_DETECTION_OUTLIER_DETECTION_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>  // for uint32_t
 
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
diff --git a/src/core/load_balancing/pick_first/pick_first.cc b/src/core/load_balancing/pick_first/pick_first.cc
index c977a032c5d..c49b8ad2bfb 100644
--- a/src/core/load_balancing/pick_first/pick_first.cc
+++ b/src/core/load_balancing/pick_first/pick_first.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/load_balancing/pick_first/pick_first.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -35,12 +39,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/load_balancing/priority/priority.cc b/src/core/load_balancing/priority/priority.cc
index a747c2ce17f..854ea3c4c79 100644
--- a/src/core/load_balancing/priority/priority.cc
+++ b/src/core/load_balancing/priority/priority.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <algorithm>
@@ -33,12 +37,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/ring_hash/ring_hash.cc b/src/core/load_balancing/ring_hash/ring_hash.cc
index 5ca33543983..5613648b1b6 100644
--- a/src/core/load_balancing/ring_hash/ring_hash.cc
+++ b/src/core/load_balancing/ring_hash/ring_hash.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/load_balancing/ring_hash/ring_hash.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -36,12 +40,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/load_balancing/ring_hash/ring_hash.h b/src/core/load_balancing/ring_hash/ring_hash.h
index da7e83b215a..95f17cbe81d 100644
--- a/src/core/load_balancing/ring_hash/ring_hash.h
+++ b/src/core/load_balancing/ring_hash/ring_hash.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_RING_HASH_RING_HASH_H
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/util/json/json.h"
diff --git a/src/core/load_balancing/rls/rls.cc b/src/core/load_balancing/rls/rls.cc
index a02da17484c..3024ebbef0d 100644
--- a/src/core/load_balancing/rls/rls.cc
+++ b/src/core/load_balancing/rls/rls.cc
@@ -22,6 +22,17 @@
 
 #include "src/core/load_balancing/rls/rls.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
@@ -51,21 +62,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -109,6 +105,8 @@
 #include "src/core/util/validation_errors.h"
 #include "src/core/util/work_serializer.h"
 #include "src/proto/grpc/lookup/v1/rls.upb.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 
 using ::grpc_event_engine::experimental::EventEngine;
 
diff --git a/src/core/load_balancing/round_robin/round_robin.cc b/src/core/load_balancing/round_robin/round_robin.cc
index 5c4c23370ed..44fa7f9104c 100644
--- a/src/core/load_balancing/round_robin/round_robin.cc
+++ b/src/core/load_balancing/round_robin/round_robin.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -33,10 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/subchannel_interface.h b/src/core/load_balancing/subchannel_interface.h
index b2d78fad05f..0042a9f0ea2 100644
--- a/src/core/load_balancing/subchannel_interface.h
+++ b/src/core/load_balancing/subchannel_interface.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_SUBCHANNEL_INTERFACE_H
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc
index 785c0ff22d3..e74714db433 100644
--- a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc
+++ b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
@@ -25,8 +27,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace {
diff --git a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
index 7245ca9607a..936033848f7 100644
--- a/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
+++ b/src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_ROUND_ROBIN_STATIC_STRIDE_SCHEDULER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,8 +27,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // StaticStrideScheduler implements a stride scheduler without the ability to
diff --git a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc
index c0403f84bd1..522b73ece7d 100644
--- a/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc
+++ b/src/core/load_balancing/weighted_round_robin/weighted_round_robin.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -39,11 +42,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/weighted_target/weighted_target.cc b/src/core/load_balancing/weighted_target/weighted_target.cc
index 8f5075a3409..bebda9cba0d 100644
--- a/src/core/load_balancing/weighted_target/weighted_target.cc
+++ b/src/core/load_balancing/weighted_target/weighted_target.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/weighted_target/weighted_target.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -37,11 +40,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc
index 98072442af5..358d9c41194 100644
--- a/src/core/load_balancing/xds/cds.cc
+++ b/src/core/load_balancing/xds/cds.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc_security.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <map>
 #include <memory>
@@ -31,12 +36,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/load_balancing/xds/xds_cluster_impl.cc b/src/core/load_balancing/xds/xds_cluster_impl.cc
index 380ed7b108a..ba655bfb762 100644
--- a/src/core/load_balancing/xds/xds_cluster_impl.cc
+++ b/src/core/load_balancing/xds/xds_cluster_impl.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -33,10 +35,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/load_balancing/xds/xds_cluster_manager.cc b/src/core/load_balancing/xds/xds_cluster_manager.cc
index 4e72ca1170c..96ad1313aeb 100644
--- a/src/core/load_balancing/xds/xds_cluster_manager.cc
+++ b/src/core/load_balancing/xds/xds_cluster_manager.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -32,11 +35,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/load_balancing/xds/xds_override_host.cc b/src/core/load_balancing/xds/xds_override_host.cc
index 1c64eeb0a13..07d800e8df7 100644
--- a/src/core/load_balancing/xds/xds_override_host.cc
+++ b/src/core/load_balancing/xds/xds_override_host.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/load_balancing/xds/xds_override_host.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -42,11 +45,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/src/core/load_balancing/xds/xds_override_host.h b/src/core/load_balancing/xds/xds_override_host.h
index 387a5036491..55317bd4756 100644
--- a/src/core/load_balancing/xds/xds_override_host.h
+++ b/src/core/load_balancing/xds/xds_override_host.h
@@ -17,10 +17,9 @@
 #ifndef GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H
 #define GRPC_SRC_CORE_LOAD_BALANCING_XDS_XDS_OVERRIDE_HOST_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/load_balancing/xds/xds_wrr_locality.cc b/src/core/load_balancing/xds/xds_wrr_locality.cc
index efdb91844d6..6ac208dc5a8 100644
--- a/src/core/load_balancing/xds/xds_wrr_locality.cc
+++ b/src/core/load_balancing/xds/xds_wrr_locality.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <map>
 #include <memory>
@@ -26,11 +30,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/resolver/.clang-format b/src/core/resolver/.clang-format
deleted file mode 100644
index 5f150ef6edb..00000000000
--- a/src/core/resolver/.clang-format
+++ /dev/null
@@ -1,50 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc
index 30f7e46cc19..326cee10754 100644
--- a/src/core/resolver/binder/binder_resolver.cc
+++ b/src/core/resolver/binder/binder_resolver.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 #include "absl/status/status.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
 #include "src/core/util/status_helper.h"
 
@@ -42,7 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
index 564fa165d8d..7f866dff773 100644
--- a/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,11 +34,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
@@ -60,7 +58,6 @@
 #include <address_sorting/address_sorting.h>
 
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/src/core/resolver/dns/c_ares/dns_resolver_ares.h b/src/core/resolver/dns/c_ares/dns_resolver_ares.h
index d8ce1c25c6b..0eb98efe38b 100644
--- a/src/core/resolver/dns/c_ares/dns_resolver_ares.h
+++ b/src/core/resolver/dns/c_ares/dns_resolver_ares.h
@@ -14,10 +14,9 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_DNS_RESOLVER_ARES_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/config/core_configuration.h"
 
 namespace grpc_core {
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
index 5a75c6c7431..eeaeddf0cdf 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h
@@ -19,14 +19,12 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_EV_DRIVER_H
 
-#include <memory>
-
 #include <ares.h>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "absl/base/thread_annotations.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
index 634ab525e84..7341ffba639 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
@@ -23,6 +23,7 @@
 
 // IWYU pragma: no_include <ares_build.h>
 
+#include <ares.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
@@ -33,12 +34,9 @@
 #include <unordered_set>
 #include <utility>
 
-#include <ares.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/ev_posix.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
index d7757fb9fc4..6f988c8710d 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -20,23 +20,20 @@
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
 #if GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 
+#include <ares.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <map>
 #include <memory>
 #include <unordered_set>
 
-#include <ares.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/sockaddr_windows.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
index e0efc6075b6..cad4cfa1918 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/util/status_helper.h"
 
@@ -37,26 +36,23 @@
 
 #if GRPC_ARES == 1
 
+#include <address_sorting/address_sorting.h>
+#include <ares.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
 #include <string.h>
 #include <sys/types.h>  // IWYU pragma: keep
 
 #include <string>
 #include <utility>
 
-#include <address_sorting/address_sorting.h>
-#include <ares.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
index 5ed2f9cc51e..272ef463ac4 100644
--- a/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
+++ b/src/core/resolver/dns/c_ares/grpc_ares_wrapper.h
@@ -19,17 +19,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_C_ARES_GRPC_ARES_WRAPPER_H
 
+#include <ares.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 
-#include <ares.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/resolver/dns/dns_resolver_plugin.cc b/src/core/resolver/dns/dns_resolver_plugin.cc
index 7e9870543b2..c40f628570e 100644
--- a/src/core/resolver/dns/dns_resolver_plugin.cc
+++ b/src/core/resolver/dns/dns_resolver_plugin.cc
@@ -13,13 +13,12 @@
 // limitations under the License.
 #include "src/core/resolver/dns/dns_resolver_plugin.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/resolver/dns/c_ares/dns_resolver_ares.h"
diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
index c65b1d506fb..61ed5677943 100644
--- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 #include "src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -33,11 +36,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/resolved_address_internal.h"
diff --git a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
index 555e91fedef..1a4fb852856 100644
--- a/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
+++ b/src/core/resolver/dns/event_engine/event_engine_client_channel_resolver.h
@@ -13,10 +13,9 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_EVENT_ENGINE_CLIENT_CHANNEL_RESOLVER_H
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/resolver/resolver.h"
 #include "src/core/resolver/resolver_factory.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/resolver/dns/event_engine/service_config_helper.cc b/src/core/resolver/dns/event_engine/service_config_helper.cc
index ba0b910e327..068ff200292 100644
--- a/src/core/resolver/dns/event_engine/service_config_helper.cc
+++ b/src/core/resolver/dns/event_engine/service_config_helper.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 #include "src/core/resolver/dns/event_engine/service_config_helper.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -20,9 +21,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/gethostname.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/resolver/dns/event_engine/service_config_helper.h b/src/core/resolver/dns/event_engine/service_config_helper.h
index 90bc82a96b6..5c89aa5e1e4 100644
--- a/src/core/resolver/dns/event_engine/service_config_helper.h
+++ b/src/core/resolver/dns/event_engine/service_config_helper.h
@@ -15,13 +15,13 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
 #define GRPC_SRC_CORE_RESOLVER_DNS_EVENT_ENGINE_SERVICE_CONFIG_HELPER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 absl::StatusOr<std::string> ChooseServiceConfig(
diff --git a/src/core/resolver/dns/native/dns_resolver.cc b/src/core/resolver/dns/native/dns_resolver.cc
index 8ee4b549f65..9c138bae997 100644
--- a/src/core/resolver/dns/native/dns_resolver.cc
+++ b/src/core/resolver/dns/native/dns_resolver.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ -27,10 +30,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
diff --git a/src/core/resolver/endpoint_addresses.cc b/src/core/resolver/endpoint_addresses.cc
index 7fc7d8d3335..aa5f46e3abd 100644
--- a/src/core/resolver/endpoint_addresses.cc
+++ b/src/core/resolver/endpoint_addresses.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/resolver/endpoint_addresses.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -29,9 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/resolver/endpoint_addresses.h b/src/core/resolver/endpoint_addresses.h
index 00a9e659784..bd5c0091be1 100644
--- a/src/core/resolver/endpoint_addresses.h
+++ b/src/core/resolver/endpoint_addresses.h
@@ -19,15 +19,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
 #define GRPC_SRC_CORE_RESOLVER_ENDPOINT_ADDRESSES_H
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "absl/functional/function_ref.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
diff --git a/src/core/resolver/fake/fake_resolver.cc b/src/core/resolver/fake/fake_resolver.cc
index b2bbaf26193..a3ff19fb353 100644
--- a/src/core/resolver/fake/fake_resolver.cc
+++ b/src/core/resolver/fake/fake_resolver.cc
@@ -19,15 +19,14 @@
 
 #include "src/core/resolver/fake/fake_resolver.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <type_traits>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/resolver/resolver_factory.h"
diff --git a/src/core/resolver/fake/fake_resolver.h b/src/core/resolver/fake/fake_resolver.h
index 5126c741577..c72187bcfc7 100644
--- a/src/core/resolver/fake/fake_resolver.h
+++ b/src/core/resolver/fake/fake_resolver.h
@@ -17,16 +17,15 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_FAKE_FAKE_RESOLVER_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/resolver/resolver.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/resolver/google_c2p/google_c2p_resolver.cc b/src/core/resolver/google_c2p/google_c2p_resolver.cc
index 42e309f900c..7aa5ee7009c 100644
--- a/src/core/resolver/google_c2p/google_c2p_resolver.cc
+++ b/src/core/resolver/google_c2p/google_c2p_resolver.cc
@@ -14,6 +14,9 @@
 // limitations under the License.
 //
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <random>
@@ -28,10 +31,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/resolver/polling_resolver.cc b/src/core/resolver/polling_resolver.cc
index 27806f1e5a9..83642ddd1c5 100644
--- a/src/core/resolver/polling_resolver.cc
+++ b/src/core/resolver/polling_resolver.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/resolver/polling_resolver.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -29,9 +30,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/src/core/resolver/polling_resolver.h b/src/core/resolver/polling_resolver.h
index fe405c3f1d4..c09ba6653c3 100644
--- a/src/core/resolver/polling_resolver.h
+++ b/src/core/resolver/polling_resolver.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_POLLING_RESOLVER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/src/core/resolver/resolver.h b/src/core/resolver/resolver.h
index 389096c3d8f..5cabc99b270 100644
--- a/src/core/resolver/resolver.h
+++ b/src/core/resolver/resolver.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/src/core/resolver/resolver_factory.h b/src/core/resolver/resolver_factory.h
index 831b67c5cfc..41df42060fc 100644
--- a/src/core/resolver/resolver_factory.h
+++ b/src/core/resolver/resolver_factory.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_FACTORY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/resolver.h"
diff --git a/src/core/resolver/resolver_registry.cc b/src/core/resolver/resolver_registry.cc
index 3033fb6aecb..56a189bf307 100644
--- a/src/core/resolver/resolver_registry.cc
+++ b/src/core/resolver/resolver_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/resolver/resolver_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
@@ -24,8 +26,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 //
diff --git a/src/core/resolver/resolver_registry.h b/src/core/resolver/resolver_registry.h
index 5e1d87fbf6b..c25f2524578 100644
--- a/src/core/resolver/resolver_registry.h
+++ b/src/core/resolver/resolver_registry.h
@@ -17,15 +17,14 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
 #define GRPC_SRC_CORE_RESOLVER_RESOLVER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/resolver.h"
diff --git a/src/core/resolver/sockaddr/sockaddr_resolver.cc b/src/core/resolver/sockaddr/sockaddr_resolver.cc
index 1cd1ac310cf..6657faa4680 100644
--- a/src/core/resolver/sockaddr/sockaddr_resolver.cc
+++ b/src/core/resolver/sockaddr/sockaddr_resolver.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -23,9 +25,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/resolver/xds/xds_config.cc b/src/core/resolver/xds/xds_config.cc
index 70158b1c365..b9e7f914513 100644
--- a/src/core/resolver/xds/xds_config.cc
+++ b/src/core/resolver/xds/xds_config.cc
@@ -23,7 +23,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/match.h"
 
 namespace grpc_core {
diff --git a/src/core/resolver/xds/xds_config.h b/src/core/resolver/xds/xds_config.h
index 784db2fc487..b5fb154663b 100644
--- a/src/core/resolver/xds/xds_config.h
+++ b/src/core/resolver/xds/xds_config.h
@@ -26,7 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/xds/grpc/xds_cluster.h"
 #include "src/core/xds/grpc/xds_endpoint.h"
diff --git a/src/core/resolver/xds/xds_dependency_manager.cc b/src/core/resolver/xds/xds_dependency_manager.cc
index 3ed9fa1da92..ddc0dcdbfd9 100644
--- a/src/core/resolver/xds/xds_dependency_manager.cc
+++ b/src/core/resolver/xds/xds_dependency_manager.cc
@@ -21,7 +21,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/resolver/fake/fake_resolver.h"
diff --git a/src/core/resolver/xds/xds_dependency_manager.h b/src/core/resolver/xds/xds_dependency_manager.h
index dcb1738b4f1..5e8ea3a00c0 100644
--- a/src/core/resolver/xds/xds_dependency_manager.h
+++ b/src/core/resolver/xds/xds_dependency_manager.h
@@ -20,7 +20,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/resolver/resolver.h"
 #include "src/core/resolver/xds/xds_config.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/resolver/xds/xds_resolver.cc b/src/core/resolver/xds/xds_resolver.cc
index 833468a7b29..fb9d1da293a 100644
--- a/src/core/resolver/xds/xds_resolver.cc
+++ b/src/core/resolver/xds/xds_resolver.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -42,12 +46,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "re2/re2.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/resolver/xds/xds_resolver_attributes.h b/src/core/resolver/xds/xds_resolver_attributes.h
index 63f2684f2a1..c0d2795afe4 100644
--- a/src/core/resolver/xds/xds_resolver_attributes.h
+++ b/src/core/resolver/xds/xds_resolver_attributes.h
@@ -17,10 +17,9 @@
 #ifndef GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
 #define GRPC_SRC_CORE_RESOLVER_XDS_XDS_RESOLVER_ATTRIBUTES_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/service_config/service_config_call_data.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/xds/grpc/xds_route_config.h"
diff --git a/src/core/server/server.cc b/src/core/server/server.cc
index f88eb5925da..5ec784a5c96 100644
--- a/src/core/server/server.cc
+++ b/src/core/server/server.cc
@@ -16,6 +16,14 @@
 
 #include "src/core/server/server.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/connectivity_state.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,16 +44,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/connectivity_state.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channel_trace.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/server/server.h b/src/core/server/server.h
index 4bd2273eac3..8f68c333eba 100644
--- a/src/core/server/server.h
+++ b/src/core/server/server.h
@@ -17,6 +17,12 @@
 #ifndef GRPC_SRC_CORE_SERVER_SERVER_H
 #define GRPC_SRC_CORE_SERVER_SERVER_H
 
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/passive_listener.h>
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -37,14 +43,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/passive_listener.h>
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/server/server_call_tracer_filter.cc b/src/core/server/server_call_tracer_filter.cc
index b4fbdafde9c..692915750d3 100644
--- a/src/core/server/server_call_tracer_filter.cc
+++ b/src/core/server/server_call_tracer_filter.cc
@@ -16,15 +16,14 @@
 
 #include "src/core/server/server_call_tracer_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/server/server_config_selector.h b/src/core/server/server_config_selector.h
index 4d766419809..4e2fda33c77 100644
--- a/src/core/server/server_config_selector.h
+++ b/src/core/server/server_config_selector.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H
 #define GRPC_SRC_CORE_SERVER_SERVER_CONFIG_SELECTOR_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/server/server_config_selector_filter.cc b/src/core/server/server_config_selector_filter.cc
index 2f221e61426..53cfb0524aa 100644
--- a/src/core/server/server_config_selector_filter.cc
+++ b/src/core/server/server_config_selector_filter.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/server/server_config_selector_filter.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <utility>
@@ -23,9 +25,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/src/core/server/xds_channel_stack_modifier.cc b/src/core/server/xds_channel_stack_modifier.cc
index 15d2d3378f3..5a31507b138 100644
--- a/src/core/server/xds_channel_stack_modifier.cc
+++ b/src/core/server/xds_channel_stack_modifier.cc
@@ -18,12 +18,12 @@
 
 #include "src/core/server/xds_channel_stack_modifier.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <initializer_list>
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/core/server/xds_channel_stack_modifier.h b/src/core/server/xds_channel_stack_modifier.h
index 78810478d99..11ec0f06325 100644
--- a/src/core/server/xds_channel_stack_modifier.h
+++ b/src/core/server/xds_channel_stack_modifier.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H
 #define GRPC_SRC_CORE_SERVER_XDS_CHANNEL_STACK_MODIFIER_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack_builder.h"
 #include "src/core/util/ref_counted.h"
diff --git a/src/core/server/xds_server_config_fetcher.cc b/src/core/server/xds_server_config_fetcher.cc
index f8b523a293e..35b64a5e19e 100644
--- a/src/core/server/xds_server_config_fetcher.cc
+++ b/src/core/server/xds_server_config_fetcher.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -39,14 +45,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/service_config/service_config.h b/src/core/service_config/service_config.h
index f9c43c35011..801205ed43e 100644
--- a/src/core/service_config/service_config.h
+++ b/src/core/service_config/service_config.h
@@ -17,13 +17,11 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_H
 
-#include <stddef.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <stddef.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/service_config/service_config_parser.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/useful.h"
diff --git a/src/core/service_config/service_config_call_data.h b/src/core/service_config/service_config_call_data.h
index 7c6bbcd2e39..87ead4b6330 100644
--- a/src/core/service_config/service_config_call_data.h
+++ b/src/core/service_config/service_config_call_data.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_CALL_DATA_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_parser.h"
diff --git a/src/core/service_config/service_config_channel_arg_filter.cc b/src/core/service_config/service_config_channel_arg_filter.cc
index c17fa1a04d6..635dd184ca5 100644
--- a/src/core/service_config/service_config_channel_arg_filter.cc
+++ b/src/core/service_config/service_config_channel_arg_filter.cc
@@ -17,6 +17,9 @@
 // This filter reads GRPC_ARG_SERVICE_CONFIG and populates ServiceConfigCallData
 // in the call context per call for direct channels.
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -26,10 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/service_config/service_config_impl.cc b/src/core/service_config/service_config_impl.cc
index a52442e09ec..f678568957a 100644
--- a/src/core/service_config/service_config_impl.cc
+++ b/src/core/service_config/service_config_impl.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/service_config/service_config_impl.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <string>
@@ -25,9 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/src/core/service_config/service_config_impl.h b/src/core/service_config/service_config_impl.h
index ca1d3d17dfb..9d6ae2a46d3 100644
--- a/src/core/service_config/service_config_impl.h
+++ b/src/core/service_config/service_config_impl.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_IMPL_H
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <memory>
@@ -27,10 +29,6 @@
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/service_config/service_config.h"
diff --git a/src/core/service_config/service_config_parser.cc b/src/core/service_config/service_config_parser.cc
index e679126375e..b3ff7392514 100644
--- a/src/core/service_config/service_config_parser.cc
+++ b/src/core/service_config/service_config_parser.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/service_config/service_config_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <string>
 
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 ServiceConfigParser ServiceConfigParser::Builder::Build() {
diff --git a/src/core/service_config/service_config_parser.h b/src/core/service_config/service_config_parser.h
index caac10a4bc8..763e7f89785 100644
--- a/src/core/service_config/service_config_parser.h
+++ b/src/core/service_config/service_config_parser.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H
 #define GRPC_SRC_CORE_SERVICE_CONFIG_SERVICE_CONFIG_PARSER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
diff --git a/src/core/telemetry/call_tracer.cc b/src/core/telemetry/call_tracer.cc
index 873db2d192b..80191bcbbf3 100644
--- a/src/core/telemetry/call_tracer.cc
+++ b/src/core/telemetry/call_tracer.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/telemetry/call_tracer.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/promise/context.h"
 #include "src/core/telemetry/tcp_tracer.h"
 
diff --git a/src/core/telemetry/call_tracer.h b/src/core/telemetry/call_tracer.h
index ab9185e2373..f91fa0b1fe1 100644
--- a/src/core/telemetry/call_tracer.h
+++ b/src/core/telemetry/call_tracer.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H
 #define GRPC_SRC_CORE_TELEMETRY_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/context.h"
diff --git a/src/core/telemetry/histogram_view.h b/src/core/telemetry/histogram_view.h
index 62018d8b840..42da4be2690 100644
--- a/src/core/telemetry/histogram_view.h
+++ b/src/core/telemetry/histogram_view.h
@@ -15,9 +15,8 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H
 #define GRPC_SRC_CORE_TELEMETRY_HISTOGRAM_VIEW_H
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 namespace grpc_core {
 
diff --git a/src/core/telemetry/metrics.cc b/src/core/telemetry/metrics.cc
index 45e2ab64bfc..9194a51d6d0 100644
--- a/src/core/telemetry/metrics.cc
+++ b/src/core/telemetry/metrics.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/telemetry/metrics.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_core {
diff --git a/src/core/telemetry/metrics.h b/src/core/telemetry/metrics.h
index b61e30d1fef..968534b7920 100644
--- a/src/core/telemetry/metrics.h
+++ b/src/core/telemetry/metrics.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_METRICS_H
 #define GRPC_SRC_CORE_TELEMETRY_METRICS_H
 
+#include <grpc/support/metrics.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdint>
 #include <memory>
 #include <type_traits>
@@ -24,10 +27,6 @@
 #include "absl/functional/function_ref.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/metrics.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/src/core/telemetry/stats.cc b/src/core/telemetry/stats.cc
index c5137e71f85..4fff0f7ec37 100644
--- a/src/core/telemetry/stats.cc
+++ b/src/core/telemetry/stats.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/telemetry/stats.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 namespace stats_detail {
diff --git a/src/core/telemetry/stats.h b/src/core/telemetry/stats.h
index 8d783dea5d7..c5b64b429ab 100644
--- a/src/core/telemetry/stats.h
+++ b/src/core/telemetry/stats.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_STATS_H
 #define GRPC_SRC_CORE_TELEMETRY_STATS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -26,9 +27,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/histogram_view.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/telemetry/stats_data.cc b/src/core/telemetry/stats_data.cc
index a357b674844..1b59c68f9c5 100644
--- a/src/core/telemetry/stats_data.cc
+++ b/src/core/telemetry/stats_data.cc
@@ -16,9 +16,8 @@
 
 #include "src/core/telemetry/stats_data.h"
 
-#include <stdint.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdint.h>
 
 namespace grpc_core {
 namespace {
diff --git a/src/core/telemetry/stats_data.h b/src/core/telemetry/stats_data.h
index 1ac7579a994..9961302a868 100644
--- a/src/core/telemetry/stats_data.h
+++ b/src/core/telemetry/stats_data.h
@@ -17,15 +17,13 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H
 #define GRPC_SRC_CORE_TELEMETRY_STATS_DATA_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <atomic>
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/telemetry/histogram_view.h"
 #include "src/core/util/per_cpu.h"
 
diff --git a/src/core/telemetry/tcp_tracer.h b/src/core/telemetry/tcp_tracer.h
index 1068678cab8..ac312d50523 100644
--- a/src/core/telemetry/tcp_tracer.h
+++ b/src/core/telemetry/tcp_tracer.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H
 #define GRPC_SRC_CORE_TELEMETRY_TCP_TRACER_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,8 +28,6 @@
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Interface for TCP tracer implementations. Created by CallTracerInterface.
diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc
index a4b908b4bdd..d768f85b216 100644
--- a/src/core/tsi/alts/crypt/aes_gcm.cc
+++ b/src/core/tsi/alts/crypt/aes_gcm.cc
@@ -16,21 +16,18 @@
 //
 //
 
-#include <string.h>
-
-#include <memory>
-
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include <string.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 
 constexpr size_t kKdfKeyLen = 32;
diff --git a/src/core/tsi/alts/crypt/gsec.cc b/src/core/tsi/alts/crypt/gsec.cc
index 591ad2bceb5..d8382aa935f 100644
--- a/src/core/tsi/alts/crypt/gsec.cc
+++ b/src/core/tsi/alts/crypt/gsec.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stdio.h>
+#include <string.h>
 
 static const char vtable_error_msg[] =
     "crypter or crypter->vtable has not been initialized properly";
diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h
index 0407955d691..726295be26a 100644
--- a/src/core/tsi/alts/crypt/gsec.h
+++ b/src/core/tsi/alts/crypt/gsec.h
@@ -20,6 +20,9 @@
 #define GRPC_SRC_CORE_TSI_ALTS_CRYPT_GSEC_H
 
 #include <assert.h>
+#include <grpc/event_engine/port.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -28,10 +31,6 @@
 
 #include "absl/types/span.h"
 
-#include <grpc/event_engine/port.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Provides accessors to all information representing a gsec key. Owns all the
diff --git a/src/core/tsi/alts/frame_protector/alts_counter.cc b/src/core/tsi/alts/frame_protector/alts_counter.cc
index 5eede6067de..a13887d2a44 100644
--- a/src/core/tsi/alts/frame_protector/alts_counter.cc
+++ b/src/core/tsi/alts/frame_protector/alts_counter.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_counter.h"
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 static void maybe_copy_error_msg(const char* src, char** dst) {
   if (dst != nullptr && src != nullptr) {
diff --git a/src/core/tsi/alts/frame_protector/alts_counter.h b/src/core/tsi/alts/frame_protector/alts_counter.h
index 9ebc0892f73..246d1586653 100644
--- a/src/core/tsi/alts/frame_protector/alts_counter.h
+++ b/src/core/tsi/alts/frame_protector/alts_counter.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_COUNTER_H
 
-#include <stdbool.h>
-#include <stdlib.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
+#include <stdlib.h>
 
 // Main struct for a crypter counter managed within seal/unseal operations.
 typedef struct alts_counter {
diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.cc b/src/core/tsi/alts/frame_protector/alts_crypter.cc
index 4938127df89..df767fb8a20 100644
--- a/src/core/tsi/alts/frame_protector/alts_crypter.cc
+++ b/src/core/tsi/alts/frame_protector/alts_crypter.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_crypter.h"
 
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 static void maybe_copy_error_msg(const char* src, char** dst) {
   if (dst != nullptr && src != nullptr) {
diff --git a/src/core/tsi/alts/frame_protector/alts_crypter.h b/src/core/tsi/alts/frame_protector/alts_crypter.h
index a660b30667c..5964fcbe7d5 100644
--- a/src/core/tsi/alts/frame_protector/alts_crypter.h
+++ b/src/core/tsi/alts/frame_protector/alts_crypter.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_CRYPTER_H
 
-#include <stdbool.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
+#include <string.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 
diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc
index b8593f225e2..534e8555465 100644
--- a/src/core/tsi/alts/frame_protector/alts_frame_protector.cc
+++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -26,10 +28,6 @@
 
 #include "absl/log/log.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/frame_protector/alts_crypter.h"
 #include "src/core/tsi/alts/frame_protector/frame_handler.h"
diff --git a/src/core/tsi/alts/frame_protector/alts_frame_protector.h b/src/core/tsi/alts/frame_protector/alts_frame_protector.h
index e1f7def8164..9ee925243e7 100644
--- a/src/core/tsi/alts/frame_protector/alts_frame_protector.h
+++ b/src/core/tsi/alts/frame_protector/alts_frame_protector.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_ALTS_FRAME_PROTECTOR_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/transport_security_interface.h"
 
diff --git a/src/core/tsi/alts/frame_protector/frame_handler.cc b/src/core/tsi/alts/frame_protector/frame_handler.cc
index a4e86f97998..7fcbcce34bb 100644
--- a/src/core/tsi/alts/frame_protector/frame_handler.cc
+++ b/src/core/tsi/alts/frame_protector/frame_handler.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/tsi/alts/frame_protector/frame_handler.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <string.h>
@@ -25,10 +27,6 @@
 #include <algorithm>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
 
diff --git a/src/core/tsi/alts/frame_protector/frame_handler.h b/src/core/tsi/alts/frame_protector/frame_handler.h
index f0a32b4409a..62a9bd042a4 100644
--- a/src/core/tsi/alts/frame_protector/frame_handler.h
+++ b/src/core/tsi/alts/frame_protector/frame_handler.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
 #define GRPC_SRC_CORE_TSI_ALTS_FRAME_PROTECTOR_FRAME_HANDLER_H
 
+#include <grpc/support/port_platform.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <grpc/support/port_platform.h>
-
 const size_t kFrameMessageType = 0x06;
 const size_t kFrameLengthFieldSize = 4;
 const size_t kFrameMessageTypeFieldSize = 4;
diff --git a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc
index f5513e574d4..62cbe099c5a 100644
--- a/src/core/tsi/alts/handshaker/alts_handshaker_client.cc
+++ b/src/core/tsi/alts/handshaker/alts_handshaker_client.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+
 #include <list>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/numbers.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/lib/surface/channel.h"
@@ -38,6 +36,7 @@
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/core/util/sync.h"
+#include "upb/mem/arena.hpp"
 
 #define TSI_ALTS_INITIAL_BUFFER_SIZE 256
 
diff --git a/src/core/tsi/alts/handshaker/alts_shared_resource.cc b/src/core/tsi/alts/handshaker/alts_shared_resource.cc
index 06d4e5e1936..ec1fe812963 100644
--- a/src/core/tsi/alts/handshaker/alts_shared_resource.cc
+++ b/src/core/tsi/alts/handshaker/alts_shared_resource.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/tsi/alts/handshaker/alts_shared_resource.h"
 
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
index 79b497bda7e..b25e14f1d85 100644
--- a/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
+++ b/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc
@@ -18,14 +18,6 @@
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "upb/mem/arena.hpp"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
@@ -33,7 +25,12 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/channel.h"
@@ -43,6 +40,7 @@
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/sync.h"
+#include "upb/mem/arena.hpp"
 
 // Main struct for ALTS TSI handshaker.
 struct alts_tsi_handshaker {
diff --git a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc
index 0c4325844bd..cc8f6dc78bd 100644
--- a/src/core/tsi/alts/handshaker/alts_tsi_utils.cc
+++ b/src/core/tsi/alts/handshaker/alts_tsi_utils.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_utils.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 
diff --git a/src/core/tsi/alts/handshaker/transport_security_common_api.cc b/src/core/tsi/alts/handshaker/transport_security_common_api.cc
index 9506eaa3b6a..a7881e0d71f 100644
--- a/src/core/tsi/alts/handshaker/transport_security_common_api.cc
+++ b/src/core/tsi/alts/handshaker/transport_security_common_api.cc
@@ -18,11 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/log.h"
 #include "upb/mem/arena.hpp"
 
-#include <grpc/support/port_platform.h>
-
 bool grpc_gcp_rpc_protocol_versions_set_max(
     grpc_gcp_rpc_protocol_versions* versions, uint32_t max_major,
     uint32_t max_minor) {
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
index 89c5dcfaa6f..5bde0334f50 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h
index eb61d2ff2e3..8bf3a661467 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_INTEGRITY_ONLY_RECORD_PROTOCOL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
index 2a568cd446e..cc10ddb8eb4 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h"
 
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h
index c4dd9ab152a..0e32bf42570 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_GRPC_PRIVACY_INTEGRITY_RECORD_PROTOCOL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
index d4e77898e35..76cf72290cc 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_common.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
index 908ed2934fd..68db992e0bf 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "src/core/tsi/alts/frame_protector/alts_counter.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h
index e29ab55b502..858d19f3b88 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_IOVEC_RECORD_PROTOCOL_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
index fce90b47f48..cbf009e99ab 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -25,10 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h"
diff --git a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h
index 42c3dee0d35..d5dbd8c4891 100644
--- a/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h
+++ b/src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H
 #define GRPC_SRC_CORE_TSI_ALTS_ZERO_COPY_FRAME_PROTECTOR_ALTS_ZERO_COPY_GRPC_PROTECTOR_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/fake_transport_security.cc b/src/core/tsi/fake_transport_security.cc
index e01dce2c687..98c073779b0 100644
--- a/src/core/tsi/fake_transport_security.cc
+++ b/src/core/tsi/fake_transport_security.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/tsi/fake_transport_security.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/local_transport_security.cc b/src/core/tsi/local_transport_security.cc
index bb25a25db41..ced2ef2baa1 100644
--- a/src/core/tsi/local_transport_security.cc
+++ b/src/core/tsi/local_transport_security.cc
@@ -18,16 +18,14 @@
 
 #include "src/core/tsi/local_transport_security.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/transport_security_grpc.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc
index 510a55bfc27..b0f961a41c8 100644
--- a/src/core/tsi/ssl/key_logging/ssl_key_logging.cc
+++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/ssl/key_logging/ssl_key_logging.h b/src/core/tsi/ssl/key_logging/ssl_key_logging.h
index c3752c1e7b0..472ddc70a09 100644
--- a/src/core/tsi/ssl/key_logging/ssl_key_logging.h
+++ b/src/core/tsi/ssl/key_logging/ssl_key_logging.h
@@ -15,18 +15,16 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H
 #define GRPC_SRC_CORE_TSI_SSL_KEY_LOGGING_SSL_KEY_LOGGING_H
 
-#include <iostream>
-#include <map>
-
-#include <openssl/ssl.h>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <openssl/ssl.h>
+
+#include <iostream>
+#include <map>
 
+#include "absl/base/thread_annotations.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/tsi/ssl/session_cache/ssl_session.h b/src/core/tsi/ssl/session_cache/ssl_session.h
index f990f3dfd52..fa57de48983 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session.h
+++ b/src/core/tsi/ssl/session_cache/ssl_session.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H
 #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_H
 
-#include <memory>
-
-#include <openssl/ssl.h>
-
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <openssl/ssl.h>
+
+#include <memory>
 
 #include "src/core/util/ref_counted.h"
 
diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc
index 7c27f36e2ab..6e107c066c5 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session_cache.cc
+++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session.h"
 #include "src/core/util/crash.h"
diff --git a/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/src/core/tsi/ssl/session_cache/ssl_session_cache.h
index 024262c9c90..b33b53aebf1 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session_cache.h
+++ b/src/core/tsi/ssl/session_cache/ssl_session_cache.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H
 #define GRPC_SRC_CORE_TSI_SSL_SESSION_CACHE_SSL_SESSION_CACHE_H
 
-#include <map>
-
-#include <openssl/ssl.h>
-
 #include <grpc/impl/grpc_types.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
+#include <openssl/ssl.h>
+
+#include <map>
 
 #include "src/core/tsi/ssl/session_cache/ssl_session.h"
 #include "src/core/util/cpp_impl_of.h"
diff --git a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
index ad78488415b..f44b4cb7335 100644
--- a/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
+++ b/src/core/tsi/ssl/session_cache/ssl_session_openssl.cc
@@ -15,17 +15,15 @@
 // limitations under the License.
 //
 //
-#include "absl/log/check.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session.h"
 #include "src/core/util/crash.h"
 
 #ifndef OPENSSL_IS_BORINGSSL
 
 #include "absl/memory/memory.h"
-
 #include "src/core/lib/slice/slice.h"
 
 // OpenSSL invalidates SSL_SESSION on SSL destruction making it pointless
diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc
index 47184174351..dbc47f85f72 100644
--- a/src/core/tsi/ssl_transport_security.cc
+++ b/src/core/tsi/ssl_transport_security.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/tsi/ssl_transport_security.h"
 
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <string.h>
 
 #include <cstdlib>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/surface/init.h"
 #include "src/core/tsi/transport_security_interface.h"
 
@@ -38,9 +37,12 @@
 #include <sys/socket.h>
 #endif
 
-#include <memory>
-#include <string>
-
+#include <grpc/grpc_crl_provider.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/thd_id.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>  // For OPENSSL_free
 #include <openssl/engine.h>
@@ -50,19 +52,14 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
+#include <memory>
+#include <string>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_crl_provider.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h"
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
diff --git a/src/core/tsi/ssl_transport_security.h b/src/core/tsi/ssl_transport_security.h
index da3b260adbd..39e07011a22 100644
--- a/src/core/tsi/ssl_transport_security.h
+++ b/src/core/tsi/ssl_transport_security.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H
 #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_H
 
-#include <memory>
-
-#include <openssl/x509.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <openssl/x509.h>
 
+#include <memory>
+
+#include "absl/strings/string_view.h"
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/ssl_transport_security_utils.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/ssl_transport_security_utils.cc b/src/core/tsi/ssl_transport_security_utils.cc
index d35baf4e618..5c3b828751e 100644
--- a/src/core/tsi/ssl_transport_security_utils.cc
+++ b/src/core/tsi/ssl_transport_security_utils.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/tsi/ssl_transport_security_utils.h"
 
+#include <grpc/support/port_platform.h>
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/ec.h>
@@ -33,9 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/transport_security_interface.h"
 
 namespace grpc_core {
diff --git a/src/core/tsi/ssl_transport_security_utils.h b/src/core/tsi/ssl_transport_security_utils.h
index 5676d8ff3a9..a718627e6a1 100644
--- a/src/core/tsi/ssl_transport_security_utils.h
+++ b/src/core/tsi/ssl_transport_security_utils.h
@@ -19,16 +19,14 @@
 #ifndef GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H
 #define GRPC_SRC_CORE_TSI_SSL_TRANSPORT_SECURITY_UTILS_H
 
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/port_platform.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/tsi/ssl/key_logging/ssl_key_logging.h"
 #include "src/core/tsi/transport_security_interface.h"
 
diff --git a/src/core/tsi/ssl_types.h b/src/core/tsi/ssl_types.h
index 221636859d1..9fb89952358 100644
--- a/src/core/tsi/ssl_types.h
+++ b/src/core/tsi/ssl_types.h
@@ -27,9 +27,8 @@
 //                      function
 //
 
-#include <openssl/ssl.h>
-
 #include <grpc/support/port_platform.h>
+#include <openssl/ssl.h>
 
 #ifdef OPENSSL_IS_BORINGSSL
 #define TSI_INT_AS_SIZE(x) ((size_t)(x))
diff --git a/src/core/tsi/transport_security.cc b/src/core/tsi/transport_security.cc
index 72ad63df90e..ccbf3664e93 100644
--- a/src/core/tsi/transport_security.cc
+++ b/src/core/tsi/transport_security.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/transport_security.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
+#include <stdlib.h>
+#include <string.h>
 
 // --- tsi_result common implementation. ---
 
diff --git a/src/core/tsi/transport_security.h b/src/core/tsi/transport_security.h
index 5fce3e15768..9f4524af212 100644
--- a/src/core/tsi/transport_security.h
+++ b/src/core/tsi/transport_security.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H
 #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_H
 
-#include <stdbool.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdbool.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/src/core/tsi/transport_security_interface.h b/src/core/tsi/transport_security_interface.h
index d0b2e03386a..a0c0ad7865f 100644
--- a/src/core/tsi/transport_security_interface.h
+++ b/src/core/tsi/transport_security_interface.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H
 #define GRPC_SRC_CORE_TSI_TRANSPORT_SECURITY_INTERFACE_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 
 // --- tsi result ---
diff --git a/src/core/util/.clang-format b/src/core/util/.clang-format
deleted file mode 100644
index 64387e9e515..00000000000
--- a/src/core/util/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: Google
-DerivePointerAlignment: false
-PointerAlignment: Left
-IncludeBlocks: Regroup
-IncludeCategories:
-  # port_platform.h is before almost everything
-  - Regex: '^<grpc/(support|impl/codegen)/port_platform.h>'
-    Priority: -100
-  # ruby.h is even more first if it's included
-  - Regex: '^<ruby/ruby.h>'
-    Priority: -200
-  # Some platforms (namely msys) need wchar to be included BEFORE
-  # anything else, especially strsafe.h.
-  - Regex: '^<wchar.h>'
-    Priority: 5
-  # use priority 100+ for grpc headers so they sort last
-  # 'system' headers - include things that have " in the names to make them
-  # stand out and get fixed
-  - Regex: '^(<|")grpc'
-    Priority: 100
-  # similary using include/ to get system headers should stand out and get
-  # fixed
-  - Regex: '^"include/'
-    Priority: 100
-  # source headers go last
-  - Regex: '^"(src|test)/'
-    Priority: 101
-  # not-grpc headers follow
-  # first, non system headers that are included like <> - these are all
-  # local carveouts, and get sorted below c++ but before non grpc "" files
-  - Regex: '^<(openssl/|uv\.h|ares\.h|address_sorting/|gmock/|gtest/|zlib|zconf|benchmark/|google/)'
-    Priority: 30
-  # first C system headers - they have a . in the filename
-  - Regex: '^<.*\.'
-    Priority: 10
-  # then C++ system headers - no ., the only thing that will match now
-  - Regex: '^<'
-    Priority: 20
-  # finally other "" includes go between system headers and our headers
-  - Regex: '^"'
-    Priority: 40
----
-Language: ObjC
-BasedOnStyle: Google
-ColumnLimit: 100
-ObjCBlockIndentWidth: 2
----
-Language: Proto
-BasedOnStyle: Google
-ColumnLimit: 100
-...
diff --git a/src/core/util/alloc.cc b/src/core/util/alloc.cc
index b89d49ff102..2ce94f9db78 100644
--- a/src/core/util/alloc.cc
+++ b/src/core/util/alloc.cc
@@ -16,15 +16,12 @@
 //
 //
 
+#include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 #include <string.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 
 void* gpr_malloc(size_t size) {
diff --git a/src/core/util/atm.cc b/src/core/util/atm.cc
index 7e7a6834bb1..536163c110d 100644
--- a/src/core/util/atm.cc
+++ b/src/core/util/atm.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/avl.h b/src/core/util/avl.h
index 23a510e949f..f5bc9b8d888 100644
--- a/src/core/util/avl.h
+++ b/src/core/util/avl.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_AVL_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 
 #include <algorithm>  // IWYU pragma: keep
diff --git a/src/core/util/backoff.cc b/src/core/util/backoff.cc
index edae00cf3c8..4367a47475d 100644
--- a/src/core/util/backoff.cc
+++ b/src/core/util/backoff.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/backoff.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 
 namespace grpc_core {
diff --git a/src/core/util/backoff.h b/src/core/util/backoff.h
index 34860793647..78f0948fe8d 100644
--- a/src/core/util/backoff.h
+++ b/src/core/util/backoff.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_BACKOFF_H
 
 #include "absl/random/random.h"
-
 #include "src/core/util/time.h"
 
 namespace grpc_core {
diff --git a/src/core/util/bitset.h b/src/core/util/bitset.h
index eec06814586..91b89d9925e 100644
--- a/src/core/util/bitset.h
+++ b/src/core/util/bitset.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_BITSET_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
diff --git a/src/core/util/chunked_vector.h b/src/core/util/chunked_vector.h
index b85c7e2e7ae..d3a1d6ba930 100644
--- a/src/core/util/chunked_vector.h
+++ b/src/core/util/chunked_vector.h
@@ -22,7 +22,6 @@
 #include <utility>
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/util/manual_constructor.h"
 
diff --git a/src/core/util/crash.cc b/src/core/util/crash.cc
index 9ab5a9852ba..c77412e2b96 100644
--- a/src/core/util/crash.cc
+++ b/src/core/util/crash.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/core/util/crash.h b/src/core/util/crash.h
index 9d0b19a5d0a..ece32088903 100644
--- a/src/core/util/crash.h
+++ b/src/core/util/crash.h
@@ -18,7 +18,6 @@
 #include <grpc/support/port_platform.h>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/debug_location.h"
 
 namespace grpc_core {
diff --git a/src/core/util/dual_ref_counted.h b/src/core/util/dual_ref_counted.h
index 6f3e3c43af6..4742c62bc2c 100644
--- a/src/core/util/dual_ref_counted.h
+++ b/src/core/util/dual_ref_counted.h
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/down_cast.h"
 #include "src/core/util/orphanable.h"
diff --git a/src/core/util/event_log.cc b/src/core/util/event_log.cc
index 6bb1427f89e..66611150e6f 100644
--- a/src/core/util/event_log.cc
+++ b/src/core/util/event_log.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/event_log.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <atomic>
 
diff --git a/src/core/util/event_log.h b/src/core/util/event_log.h
index f77967d57f2..47254348db5 100644
--- a/src/core/util/event_log.h
+++ b/src/core/util/event_log.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_EVENT_LOG_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <atomic>
@@ -26,7 +25,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
 #include "src/core/util/per_cpu.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/time_precise.h"
diff --git a/src/core/util/examine_stack.cc b/src/core/util/examine_stack.cc
index 96799b2a30c..a47f12472ca 100644
--- a/src/core/util/examine_stack.cc
+++ b/src/core/util/examine_stack.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/examine_stack.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 gpr_current_stack_trace_func g_current_stack_trace_provider = nullptr;
diff --git a/src/core/util/fork.cc b/src/core/util/fork.cc
index 35b211b42ff..27415423f1b 100644
--- a/src/core/util/fork.cc
+++ b/src/core/util/fork.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/fork.h"
 
-#include <utility>
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include <utility>
+
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/thread_local.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/util/gcp_metadata_query.cc b/src/core/util/gcp_metadata_query.cc
index 3543e46fa0e..cc9fd80cd1b 100644
--- a/src/core/util/gcp_metadata_query.cc
+++ b/src/core/util/gcp_metadata_query.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/gcp_metadata_query.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -31,11 +33,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/util/gcp_metadata_query.h b/src/core/util/gcp_metadata_query.h
index b2abde5cd4a..a72ff5ae4d0 100644
--- a/src/core/util/gcp_metadata_query.h
+++ b/src/core/util/gcp_metadata_query.h
@@ -23,7 +23,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/polling_entity.h"
diff --git a/src/core/util/gethostname_host_name_max.cc b/src/core/util/gethostname_host_name_max.cc
index def6984395d..d446d67c35c 100644
--- a/src/core/util/gethostname_host_name_max.cc
+++ b/src/core/util/gethostname_host_name_max.cc
@@ -23,11 +23,10 @@
 
 #ifdef GRPC_POSIX_HOST_NAME_MAX
 
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <unistd.h>
 
-#include <grpc/support/alloc.h>
-
 char* grpc_gethostname() {
   char* hostname = static_cast<char*>(gpr_malloc(HOST_NAME_MAX));
   if (gethostname(hostname, HOST_NAME_MAX) != 0) {
diff --git a/src/core/util/gethostname_sysconf.cc b/src/core/util/gethostname_sysconf.cc
index 414a02118a0..78d38cc869b 100644
--- a/src/core/util/gethostname_sysconf.cc
+++ b/src/core/util/gethostname_sysconf.cc
@@ -23,9 +23,8 @@
 
 #ifdef GRPC_POSIX_SYSCONF
 
-#include <unistd.h>
-
 #include <grpc/support/alloc.h>
+#include <unistd.h>
 
 char* grpc_gethostname() {
   size_t host_name_max = (size_t)sysconf(_SC_HOST_NAME_MAX);
diff --git a/src/core/util/gpr_time.cc b/src/core/util/gpr_time.cc
index ae2bd82f5bc..9368e51416b 100644
--- a/src/core/util/gpr_time.cc
+++ b/src/core/util/gpr_time.cc
@@ -18,17 +18,14 @@
 
 // Generic implementation of time calls.
 
+#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 
 int gpr_time_cmp(gpr_timespec a, gpr_timespec b) {
diff --git a/src/core/util/grpc_if_nametoindex.h b/src/core/util/grpc_if_nametoindex.h
index ad1f3fcc224..237cd034da8 100644
--- a/src/core/util/grpc_if_nametoindex.h
+++ b/src/core/util/grpc_if_nametoindex.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_GRPC_IF_NAMETOINDEX_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 // Returns the interface index corresponding to the interface "name" provided.
diff --git a/src/core/util/grpc_if_nametoindex_posix.cc b/src/core/util/grpc_if_nametoindex_posix.cc
index 1ec5f15cc99..1d5b866e5e0 100644
--- a/src/core/util/grpc_if_nametoindex_posix.cc
+++ b/src/core/util/grpc_if_nametoindex_posix.cc
@@ -26,7 +26,6 @@
 #include <net/if.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_if_nametoindex.h"
 
diff --git a/src/core/util/grpc_if_nametoindex_unsupported.cc b/src/core/util/grpc_if_nametoindex_unsupported.cc
index 767f41b67f6..cabca947c60 100644
--- a/src/core/util/grpc_if_nametoindex_unsupported.cc
+++ b/src/core/util/grpc_if_nametoindex_unsupported.cc
@@ -23,7 +23,6 @@
 #if GRPC_IF_NAMETOINDEX == 0 || !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX)
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/grpc_if_nametoindex.h"
 
diff --git a/src/core/util/host_port.cc b/src/core/util/host_port.cc
index dad028d0b4a..3f2608951e3 100644
--- a/src/core/util/host_port.cc
+++ b/src/core/util/host_port.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/host_port.h"
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
diff --git a/src/core/util/http_client/format_request.cc b/src/core/util/http_client/format_request.cc
index 1d785835e2b..8c56935dad0 100644
--- a/src/core/util/http_client/format_request.cc
+++ b/src/core/util/http_client/format_request.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/http_client/format_request.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -31,9 +31,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/util/http_client/httpcli.h"
 
 static void fill_common_header(const grpc_http_request* request,
diff --git a/src/core/util/http_client/format_request.h b/src/core/util/http_client/format_request.h
index ab9d6a9d7d5..e123234ce5c 100644
--- a/src/core/util/http_client/format_request.h
+++ b/src/core/util/http_client/format_request.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_FORMAT_REQUEST_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/http_client/parser.h"
 
diff --git a/src/core/util/http_client/httpcli.cc b/src/core/util/http_client/httpcli.cc
index c7b52e2de54..0eb2292d9b1 100644
--- a/src/core/util/http_client/httpcli.cc
+++ b/src/core/util/http_client/httpcli.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/http_client/httpcli.h"
 
+#include <grpc/grpc.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 
 #include <string>
@@ -29,11 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_registry.h"
 #include "src/core/handshaker/tcp_connect/tcp_connect_handshaker.h"
diff --git a/src/core/util/http_client/httpcli.h b/src/core/util/http_client/httpcli.h
index b041d190e07..8857d0df014 100644
--- a/src/core/util/http_client/httpcli.h
+++ b/src/core/util/http_client/httpcli.h
@@ -19,8 +19,9 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_H
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <functional>
@@ -32,10 +33,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/src/core/util/http_client/httpcli_security_connector.cc b/src/core/util/http_client/httpcli_security_connector.cc
index 45156af53d1..ac1e522bb99 100644
--- a/src/core/util/http_client/httpcli_security_connector.cc
+++ b/src/core/util/http_client/httpcli_security_connector.cc
@@ -16,8 +16,13 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <string>
@@ -27,14 +32,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/util/http_client/httpcli_ssl_credentials.h b/src/core/util/http_client/httpcli_ssl_credentials.h
index e06668f65b5..6593d66a3d6 100644
--- a/src/core/util/http_client/httpcli_ssl_credentials.h
+++ b/src/core/util/http_client/httpcli_ssl_credentials.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_HTTPCLI_SSL_CREDENTIALS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/core/util/http_client/parser.cc b/src/core/util/http_client/parser.cc
index b0c7416c6c9..a490f212ee9 100644
--- a/src/core/util/http_client/parser.cc
+++ b/src/core/util/http_client/parser.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/http_client/parser.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <algorithm>
@@ -28,8 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 
-#include <grpc/support/alloc.h>
-
 static char* buf2str(void* buffer, size_t length) {
   char* out = static_cast<char*>(gpr_malloc(length + 1));
   memcpy(out, buffer, length);
diff --git a/src/core/util/http_client/parser.h b/src/core/util/http_client/parser.h
index 01727e0e4df..d1bdf767a89 100644
--- a/src/core/util/http_client/parser.h
+++ b/src/core/util/http_client/parser.h
@@ -19,13 +19,11 @@
 #ifndef GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
 #define GRPC_SRC_CORE_UTIL_HTTP_CLIENT_PARSER_H
 
+#include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/slice.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 
diff --git a/src/core/util/iphone/cpu.cc b/src/core/util/iphone/cpu.cc
index 26c3726fc13..820246594c7 100644
--- a/src/core/util/iphone/cpu.cc
+++ b/src/core/util/iphone/cpu.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
 
 #ifdef GPR_CPU_IPHONE
 
diff --git a/src/core/util/json/json.h b/src/core/util/json/json.h
index 9dbc95e3b94..a160fd3237f 100644
--- a/src/core/util/json/json.h
+++ b/src/core/util/json/json.h
@@ -17,9 +17,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_JSON_JSON_H
 #define GRPC_SRC_CORE_UTIL_JSON_JSON_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 namespace grpc_core {
 
diff --git a/src/core/util/json/json_channel_args.h b/src/core/util/json/json_channel_args.h
index fe64a377faa..ad5b1c1f897 100644
--- a/src/core/util/json/json_channel_args.h
+++ b/src/core/util/json/json_channel_args.h
@@ -19,7 +19,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/json/json_args.h"
 
diff --git a/src/core/util/json/json_object_loader.cc b/src/core/util/json/json_object_loader.cc
index 0d6dd4588a5..0eb496f5a87 100644
--- a/src/core/util/json/json_object_loader.cc
+++ b/src/core/util/json/json_object_loader.cc
@@ -12,18 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json_object_loader.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/strings/ascii.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
 
-#include <grpc/support/json.h>
-
 namespace grpc_core {
 namespace json_detail {
 
diff --git a/src/core/util/json/json_object_loader.h b/src/core/util/json/json_object_loader.h
index 1c1e8c565e1..96bd8655b91 100644
--- a/src/core/util/json/json_object_loader.h
+++ b/src/core/util/json/json_object_loader.h
@@ -31,7 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/util/json/json_reader.cc b/src/core/util/json/json_reader.cc
index bda35becad4..a93bb15a97e 100644
--- a/src/core/util/json/json_reader.cc
+++ b/src/core/util/json/json_reader.cc
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
-
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -34,9 +34,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/match.h"
 
diff --git a/src/core/util/json/json_reader.h b/src/core/util/json/json_reader.h
index 2b16d911981..127b3808807 100644
--- a/src/core/util/json/json_reader.h
+++ b/src/core/util/json/json_reader.h
@@ -21,7 +21,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/json/json.h"
 
 namespace grpc_core {
diff --git a/src/core/util/json/json_util.cc b/src/core/util/json/json_util.cc
index 88fdbb6755c..181882d7316 100644
--- a/src/core/util/json/json_util.cc
+++ b/src/core/util/json/json_util.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json_util.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/no_destruct.h"
diff --git a/src/core/util/json/json_util.h b/src/core/util/json/json_util.h
index a8abf9efb88..7cb5b8b1103 100644
--- a/src/core/util/json/json_util.h
+++ b/src/core/util/json/json_util.h
@@ -31,7 +31,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/time.h"
diff --git a/src/core/util/json/json_writer.cc b/src/core/util/json/json_writer.cc
index 009b31a4afc..37721f95228 100644
--- a/src/core/util/json/json_writer.cc
+++ b/src/core/util/json/json_writer.cc
@@ -17,7 +17,6 @@
 //
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -27,7 +26,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/json/json.h"
 
 namespace grpc_core {
diff --git a/src/core/util/latent_see.cc b/src/core/util/latent_see.cc
index c8331144407..277ed57b3c5 100644
--- a/src/core/util/latent_see.cc
+++ b/src/core/util/latent_see.cc
@@ -24,7 +24,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
 #include "src/core/util/ring_buffer.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/core/util/latent_see.h b/src/core/util/latent_see.h
index 1ace01110a6..f801c3c8685 100644
--- a/src/core/util/latent_see.h
+++ b/src/core/util/latent_see.h
@@ -34,7 +34,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/per_cpu.h"
 #include "src/core/util/ring_buffer.h"
 #include "src/core/util/sync.h"
diff --git a/src/core/util/linux/cpu.cc b/src/core/util/linux/cpu.cc
index 61f1d5d58ff..41730292e89 100644
--- a/src/core/util/linux/cpu.cc
+++ b/src/core/util/linux/cpu.cc
@@ -25,15 +25,13 @@
 #ifdef GPR_CPU_LINUX
 
 #include <errno.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/sync.h>
 #include <sched.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/cpu.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/strerror.h"
 
diff --git a/src/core/util/load_file.cc b/src/core/util/load_file.cc
index 91ec375ba65..2fda3c55e62 100644
--- a/src/core/util/load_file.cc
+++ b/src/core/util/load_file.cc
@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/load_file.h"
 
 #include <errno.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -24,9 +25,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 
 // Loads the content of a file into a slice. add_null_terminator will add a NULL
diff --git a/src/core/util/load_file.h b/src/core/util/load_file.h
index 5d3f7aa784f..980e0c11af6 100644
--- a/src/core/util/load_file.h
+++ b/src/core/util/load_file.h
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/slice/slice.h"
 
 namespace grpc_core {
diff --git a/src/core/util/log.cc b/src/core/util/log.cc
index cc353fcbd64..fb0119947c3 100644
--- a/src/core/util/log.cc
+++ b/src/core/util/log.cc
@@ -16,10 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "absl/log/log.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -27,11 +29,6 @@
 #include "absl/log/globals.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
diff --git a/src/core/util/manual_constructor.h b/src/core/util/manual_constructor.h
index 38d4695753f..10bf8155827 100644
--- a/src/core/util/manual_constructor.h
+++ b/src/core/util/manual_constructor.h
@@ -22,7 +22,6 @@
 // manually construct a region of memory with some type
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <utility>
diff --git a/src/core/util/match.h b/src/core/util/match.h
index 69b91f2fc9b..32d1445f9b3 100644
--- a/src/core/util/match.h
+++ b/src/core/util/match.h
@@ -20,7 +20,6 @@
 #include <utility>
 
 #include "absl/types/variant.h"
-
 #include "src/core/util/overload.h"
 
 namespace grpc_core {
diff --git a/src/core/util/matchers.cc b/src/core/util/matchers.cc
index a0a8b786bec..d4f6c3bd7e1 100644
--- a/src/core/util/matchers.cc
+++ b/src/core/util/matchers.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/matchers.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
diff --git a/src/core/util/matchers.h b/src/core/util/matchers.h
index 69992106b45..922e0632bc7 100644
--- a/src/core/util/matchers.h
+++ b/src/core/util/matchers.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_MATCHERS_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <memory>
diff --git a/src/core/util/memory.h b/src/core/util/memory.h
index eae0aaa4b83..9ced5cf2f64 100644
--- a/src/core/util/memory.h
+++ b/src/core/util/memory.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_UTIL_MEMORY_H
 #define GRPC_SRC_CORE_UTIL_MEMORY_H
 
+#include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
 #include <memory>
 #include <type_traits>
 
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 
 class DefaultDeleteChar {
diff --git a/src/core/util/mpscq.cc b/src/core/util/mpscq.cc
index 45258346443..fd998e8c905 100644
--- a/src/core/util/mpscq.cc
+++ b/src/core/util/mpscq.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/mpscq.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 //
diff --git a/src/core/util/mpscq.h b/src/core/util/mpscq.h
index b4d48f78c3d..44502a0b352 100644
--- a/src/core/util/mpscq.h
+++ b/src/core/util/mpscq.h
@@ -24,7 +24,6 @@
 #include <atomic>
 
 #include "absl/log/check.h"
-
 #include "src/core/util/sync.h"
 
 namespace grpc_core {
diff --git a/src/core/util/msys/tmpfile.cc b/src/core/util/msys/tmpfile.cc
index 69eb209b149..5d7cf6484c6 100644
--- a/src/core/util/msys/tmpfile.cc
+++ b/src/core/util/msys/tmpfile.cc
@@ -20,14 +20,13 @@
 
 #ifdef GPR_MSYS_TMPFILE
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <io.h>
 #include <stdio.h>
 #include <string.h>
 #include <tchar.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string_windows.h"
 #include "src/core/util/tmpfile.h"
diff --git a/src/core/util/notification.h b/src/core/util/notification.h
index 45acff0fda7..4fca3d26cb5 100644
--- a/src/core/util/notification.h
+++ b/src/core/util/notification.h
@@ -19,7 +19,6 @@
 
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
 #include "src/core/util/sync.h"
 
 namespace grpc_core {
diff --git a/src/core/util/per_cpu.cc b/src/core/util/per_cpu.cc
index 8412f399173..13098726bc7 100644
--- a/src/core/util/per_cpu.cc
+++ b/src/core/util/per_cpu.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/per_cpu.h"
 
 #include <grpc/support/cpu.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/per_cpu.h b/src/core/util/per_cpu.h
index 492ea2832b4..69648aa57fe 100644
--- a/src/core/util/per_cpu.h
+++ b/src/core/util/per_cpu.h
@@ -15,8 +15,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_PER_CPU_H
 #define GRPC_SRC_CORE_UTIL_PER_CPU_H
 
+#include <grpc/support/cpu.h>
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <algorithm>
@@ -24,8 +24,6 @@
 #include <limits>
 #include <memory>
 
-#include <grpc/support/cpu.h>
-
 // Sharded collections of objects
 // This used to be per-cpu, now it's much less so - but still a way to limit
 // contention.
diff --git a/src/core/util/posix/cpu.cc b/src/core/util/posix/cpu.cc
index 93e6cce0614..92a9e45635e 100644
--- a/src/core/util/posix/cpu.cc
+++ b/src/core/util/posix/cpu.cc
@@ -21,15 +21,13 @@
 #if defined(GPR_CPU_POSIX)
 
 #include <errno.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/sync.h>
 #include <pthread.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/cpu.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/posix/stat.cc b/src/core/util/posix/stat.cc
index e4c870f8dbd..5de6f456321 100644
--- a/src/core/util/posix/stat.cc
+++ b/src/core/util/posix/stat.cc
@@ -29,7 +29,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/stat.h"
 #include "src/core/util/strerror.h"
 
diff --git a/src/core/util/posix/string.cc b/src/core/util/posix/string.cc
index 51a16d33cba..f7fad2b9f93 100644
--- a/src/core/util/posix/string.cc
+++ b/src/core/util/posix/string.cc
@@ -20,13 +20,12 @@
 
 #ifdef GPR_POSIX_STRING
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 int gpr_asprintf(char** strp, const char* format, ...) {
   va_list args;
   int ret;
diff --git a/src/core/util/posix/sync.cc b/src/core/util/posix/sync.cc
index 255eec517a3..5529ee05c23 100644
--- a/src/core/util/posix/sync.cc
+++ b/src/core/util/posix/sync.cc
@@ -22,14 +22,12 @@
     !defined(GPR_CUSTOM_SYNC)
 
 #include <errno.h>
-#include <time.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <time.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 void gpr_mu_init(gpr_mu* mu) {
diff --git a/src/core/util/posix/thd.cc b/src/core/util/posix/thd.cc
index 6987e3ff2cd..764882dd676 100644
--- a/src/core/util/posix/thd.cc
+++ b/src/core/util/posix/thd.cc
@@ -19,7 +19,6 @@
 // Posix implementation for gpr threads.
 
 #include <grpc/support/port_platform.h>
-
 #include <inttypes.h>
 
 #include <csignal>
@@ -27,6 +26,9 @@
 
 #ifdef GPR_POSIX_SYNC
 
+#include <grpc/support/sync.h>
+#include <grpc/support/thd_id.h>
+#include <grpc/support/time.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
@@ -34,11 +36,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/thd_id.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/fork.h"
 #include "src/core/util/strerror.h"
diff --git a/src/core/util/posix/time.cc b/src/core/util/posix/time.cc
index a425a4721c6..ff444682101 100644
--- a/src/core/util/posix/time.cc
+++ b/src/core/util/posix/time.cc
@@ -28,11 +28,10 @@
 #ifdef __linux__
 #include <sys/syscall.h>
 #endif
-#include "absl/log/check.h"
-
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 static struct timespec timespec_from_gpr(gpr_timespec gts) {
diff --git a/src/core/util/posix/tmpfile.cc b/src/core/util/posix/tmpfile.cc
index 51b900a3527..832391f1599 100644
--- a/src/core/util/posix/tmpfile.cc
+++ b/src/core/util/posix/tmpfile.cc
@@ -21,16 +21,14 @@
 #ifdef GPR_POSIX_TMPFILE
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/strerror.h"
 #include "src/core/util/string.h"
diff --git a/src/core/util/random_early_detection.cc b/src/core/util/random_early_detection.cc
index 882a7d530e9..d011ca25dc8 100644
--- a/src/core/util/random_early_detection.cc
+++ b/src/core/util/random_early_detection.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/random_early_detection.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/random/distributions.h"
 
 namespace grpc_core {
diff --git a/src/core/util/random_early_detection.h b/src/core/util/random_early_detection.h
index fb2ea8f51a4..6ff1c67fd12 100644
--- a/src/core/util/random_early_detection.h
+++ b/src/core/util/random_early_detection.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_RANDOM_EARLY_DETECTION_H
 
 #include <grpc/support/port_platform.h>
-
 #include <limits.h>
 
 #include <cstdint>
diff --git a/src/core/util/ref_counted.h b/src/core/util/ref_counted.h
index e32472d1c80..413e5d4f42a 100644
--- a/src/core/util/ref_counted.h
+++ b/src/core/util/ref_counted.h
@@ -27,7 +27,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/atomic_utils.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/down_cast.h"
diff --git a/src/core/util/ref_counted_ptr.h b/src/core/util/ref_counted_ptr.h
index 28829bc0d20..601cc45e2dc 100644
--- a/src/core/util/ref_counted_ptr.h
+++ b/src/core/util/ref_counted_ptr.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_REF_COUNTED_PTR_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <iosfwd>
@@ -28,7 +27,6 @@
 #include <utility>
 
 #include "absl/hash/hash.h"
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/down_cast.h"
 
diff --git a/src/core/util/ref_counted_string.cc b/src/core/util/ref_counted_string.cc
index 2b3f6f66b36..6c2945adb9c 100644
--- a/src/core/util/ref_counted_string.cc
+++ b/src/core/util/ref_counted_string.cc
@@ -14,16 +14,14 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted_string.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <new>
 
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 
 RefCountedPtr<RefCountedString> RefCountedString::Make(absl::string_view src) {
diff --git a/src/core/util/ref_counted_string.h b/src/core/util/ref_counted_string.h
index ed3e93089ae..936d9c5742f 100644
--- a/src/core/util/ref_counted_string.h
+++ b/src/core/util/ref_counted_string.h
@@ -18,13 +18,11 @@
 #define GRPC_SRC_CORE_UTIL_REF_COUNTED_STRING_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <string>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/core/util/spinlock.h b/src/core/util/spinlock.h
index b95d324e988..fdbce0cad6d 100644
--- a/src/core/util/spinlock.h
+++ b/src/core/util/spinlock.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_UTIL_SPINLOCK_H
 #define GRPC_SRC_CORE_UTIL_SPINLOCK_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 
 // Simple spinlock. No backoff strategy, gpr_spinlock_lock is almost always
 // a concurrency code smell. Code must _never_ block while holding a spinlock
diff --git a/src/core/util/stat.h b/src/core/util/stat.h
index e947c0a5de9..d3b5d4a6638 100644
--- a/src/core/util/stat.h
+++ b/src/core/util/stat.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_UTIL_STAT_H
 
 #include <grpc/support/port_platform.h>
-
 #include <time.h>
 
 #include "absl/status/status.h"
diff --git a/src/core/util/status_helper.cc b/src/core/util/status_helper.cc
index 339500e2b0c..3d69b20fde5 100644
--- a/src/core/util/status_helper.cc
+++ b/src/core/util/status_helper.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/status_helper.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <utility>
@@ -34,11 +33,10 @@
 #include "absl/time/clock.h"
 #include "google/protobuf/any.upb.h"
 #include "google/rpc/status.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/util/status_helper.h b/src/core/util/status_helper.h
index e2e089ce25e..d7fb53da7a5 100644
--- a/src/core/util/status_helper.h
+++ b/src/core/util/status_helper.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_STATUS_HELPER_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <string>
@@ -30,7 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
 #include "src/core/util/debug_location.h"
 
 extern "C" {
diff --git a/src/core/util/strerror.cc b/src/core/util/strerror.cc
index 868acee2c06..06ad2ea092a 100644
--- a/src/core/util/strerror.cc
+++ b/src/core/util/strerror.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/strerror.h"
 
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include "absl/strings/str_format.h"
diff --git a/src/core/util/string.cc b/src/core/util/string.cc
index 3048a432a63..036a23afbb2 100644
--- a/src/core/util/string.cc
+++ b/src/core/util/string.cc
@@ -16,11 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/string.h"
 
 #include <ctype.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -30,10 +31,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/string.h b/src/core/util/string.h
index 66f3d0f8344..018980a2a89 100644
--- a/src/core/util/string.h
+++ b/src/core/util/string.h
@@ -20,14 +20,12 @@
 #define GRPC_SRC_CORE_UTIL_STRING_H
 
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/time.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
-#include <grpc/support/time.h>
-
 // String utility functions
 
 // Flags for gpr_dump function.
diff --git a/src/core/util/subprocess_posix.cc b/src/core/util/subprocess_posix.cc
index b421d50549c..ef4512b3734 100644
--- a/src/core/util/subprocess_posix.cc
+++ b/src/core/util/subprocess_posix.cc
@@ -21,6 +21,7 @@
 #ifdef GPR_POSIX_SUBPROCESS
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
 #include <signal.h>
 #include <string.h>
 #include <sys/wait.h>
@@ -31,9 +32,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/substitute.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/memory.h"
 #include "src/core/util/strerror.h"
 #include "src/core/util/subprocess.h"
diff --git a/src/core/util/subprocess_windows.cc b/src/core/util/subprocess_windows.cc
index c8760ec3ee7..71fd6497e78 100644
--- a/src/core/util/subprocess_windows.cc
+++ b/src/core/util/subprocess_windows.cc
@@ -20,6 +20,7 @@
 
 #ifdef GPR_WINDOWS_SUBPROCESS
 
+#include <grpc/support/alloc.h>
 #include <string.h>
 #include <tchar.h>
 #include <windows.h>
@@ -27,9 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "src/core/util/subprocess.h"
diff --git a/src/core/util/sync.cc b/src/core/util/sync.cc
index dd3db7e6423..7a5f24409ee 100644
--- a/src/core/util/sync.cc
+++ b/src/core/util/sync.cc
@@ -18,15 +18,13 @@
 
 // Generic implementation of synchronization primitives.
 
-#include <grpc/support/port_platform.h>
-
 #include <assert.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
+#include "absl/log/check.h"
+
 // Number of mutexes to allocate for events, to avoid lock contention.
 // Should be a prime.
 enum { event_sync_partitions = 31 };
diff --git a/src/core/util/sync.h b/src/core/util/sync.h
index c85d9e2ad77..77d1a54206f 100644
--- a/src/core/util/sync.h
+++ b/src/core/util/sync.h
@@ -20,13 +20,12 @@
 #define GRPC_SRC_CORE_UTIL_SYNC_H
 
 #include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/synchronization/mutex.h"
 
-#include <grpc/support/sync.h>
-
 #ifndef GPR_ABSEIL_SYNC
 #include "src/core/util/time_util.h"
 #endif
diff --git a/src/core/util/sync_abseil.cc b/src/core/util/sync_abseil.cc
index 9e837022532..688e4665612 100644
--- a/src/core/util/sync_abseil.cc
+++ b/src/core/util/sync_abseil.cc
@@ -21,17 +21,15 @@
 #if defined(GPR_ABSEIL_SYNC) && !defined(GPR_CUSTOM_SYNC)
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <time.h>
 
 #include "absl/base/call_once.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/time_util.h"
 
diff --git a/src/core/util/table.h b/src/core/util/table.h
index bd35c4963a8..d2ea9d42a97 100644
--- a/src/core/util/table.h
+++ b/src/core/util/table.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_TABLE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <initializer_list>
@@ -26,7 +25,6 @@
 
 #include "absl/meta/type_traits.h"
 #include "absl/utility/utility.h"
-
 #include "src/core/util/bitset.h"
 
 namespace grpc_core {
diff --git a/src/core/util/tchar.cc b/src/core/util/tchar.cc
index f558b4cbc1d..ee9634be76a 100644
--- a/src/core/util/tchar.cc
+++ b/src/core/util/tchar.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/tchar.h"
 
+#include <grpc/support/port_platform.h>
+
 #ifdef GPR_WINDOWS
 
 namespace grpc_core {
diff --git a/src/core/util/thd.h b/src/core/util/thd.h
index ec0ae599f7f..61f229af97e 100644
--- a/src/core/util/thd.h
+++ b/src/core/util/thd.h
@@ -22,7 +22,7 @@
 /// Internal thread interface.
 
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/thd_id.h>
 #include <stddef.h>
 
 #include <memory>
@@ -31,8 +31,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/support/thd_id.h>
-
 namespace grpc_core {
 namespace internal {
 
diff --git a/src/core/util/time.cc b/src/core/util/time.cc
index c5f899bc473..a15242f3b03 100644
--- a/src/core/util/time.cc
+++ b/src/core/util/time.cc
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <atomic>
 #include <chrono>
 #include <limits>
@@ -25,9 +26,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/no_destruct.h"
 
 // IWYU pragma: no_include <ratio>
diff --git a/src/core/util/time.h b/src/core/util/time.h
index cf242eba1cb..c51b3cf63ed 100644
--- a/src/core/util/time.h
+++ b/src/core/util/time.h
@@ -15,8 +15,9 @@
 #ifndef GRPC_SRC_CORE_UTIL_TIME_H
 #define GRPC_SRC_CORE_UTIL_TIME_H
 
+#include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
-
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <limits>
@@ -24,10 +25,6 @@
 #include <string>
 
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/time_precise.h"
 #include "src/core/util/useful.h"
 
diff --git a/src/core/util/time_averaged_stats.cc b/src/core/util/time_averaged_stats.cc
index dc6db49a011..caf52f72751 100644
--- a/src/core/util/time_averaged_stats.cc
+++ b/src/core/util/time_averaged_stats.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time_averaged_stats.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 TimeAveragedStats::TimeAveragedStats(double init_avg, double regress_weight,
diff --git a/src/core/util/time_precise.cc b/src/core/util/time_precise.cc
index 5274789c70e..0fe62929ef2 100644
--- a/src/core/util/time_precise.cc
+++ b/src/core/util/time_precise.cc
@@ -23,12 +23,11 @@
 #include <unistd.h>
 #endif
 
+#include <grpc/support/time.h>
+
 #include <algorithm>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/time_precise.h"
 
diff --git a/src/core/util/time_precise.h b/src/core/util/time_precise.h
index 9decb6d4cfd..285b710ab0a 100644
--- a/src/core/util/time_precise.h
+++ b/src/core/util/time_precise.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_TIME_PRECISE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <grpc/support/time.h>
 
 // Depending on the platform gpr_get_cycle_counter() can have a resolution as
diff --git a/src/core/util/time_util.cc b/src/core/util/time_util.cc
index 4730e79184a..d20dca30e52 100644
--- a/src/core/util/time_util.cc
+++ b/src/core/util/time_util.cc
@@ -14,17 +14,15 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/time_util.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <time.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/support/time.h>
-
 namespace grpc_core {
 
 gpr_timespec ToGprTimeSpec(absl::Duration duration) {
diff --git a/src/core/util/time_util.h b/src/core/util/time_util.h
index 61ad6d11a5b..29e599e5c96 100644
--- a/src/core/util/time_util.h
+++ b/src/core/util/time_util.h
@@ -18,11 +18,10 @@
 #define GRPC_SRC_CORE_UTIL_TIME_UTIL_H
 
 #include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 
 #include "absl/time/time.h"
 
-#include <grpc/support/time.h>
-
 namespace grpc_core {
 
 // Converts absl::Duration to gpr_timespec(GPR_TIMESPAN)
diff --git a/src/core/util/tmpfile.h b/src/core/util/tmpfile.h
index d1ed3d0558c..ecda0c0611a 100644
--- a/src/core/util/tmpfile.h
+++ b/src/core/util/tmpfile.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_TMPFILE_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdio.h>
 
 // Creates a temporary file from a prefix.
diff --git a/src/core/util/unique_type_name.h b/src/core/util/unique_type_name.h
index 29e63d8404f..fa723dc8d0c 100644
--- a/src/core/util/unique_type_name.h
+++ b/src/core/util/unique_type_name.h
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/useful.h"
 
 // Provides a type name that is unique by instance rather than by
diff --git a/src/core/util/uri.cc b/src/core/util/uri.cc
index 82fb29d46e1..e6a94e57173 100644
--- a/src/core/util/uri.cc
+++ b/src/core/util/uri.cc
@@ -14,11 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/uri.h"
 
 #include <ctype.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
diff --git a/src/core/util/uuid_v4.cc b/src/core/util/uuid_v4.cc
index b0847a8d33e..7cbf7cb7020 100644
--- a/src/core/util/uuid_v4.cc
+++ b/src/core/util/uuid_v4.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/uuid_v4.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/strings/str_format.h"
 
 namespace grpc_core {
diff --git a/src/core/util/uuid_v4.h b/src/core/util/uuid_v4.h
index e7bf52c6409..84e8e576780 100644
--- a/src/core/util/uuid_v4.h
+++ b/src/core/util/uuid_v4.h
@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_UTIL_UUID_V4_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
 #include <string>
diff --git a/src/core/util/validation_errors.cc b/src/core/util/validation_errors.cc
index 047ea420161..5ab09f6d76d 100644
--- a/src/core/util/validation_errors.cc
+++ b/src/core/util/validation_errors.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/validation_errors.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 
 #include <utility>
diff --git a/src/core/util/validation_errors.h b/src/core/util/validation_errors.h
index 5c075c12cce..4038d927c9a 100644
--- a/src/core/util/validation_errors.h
+++ b/src/core/util/validation_errors.h
@@ -16,7 +16,6 @@
 #define GRPC_SRC_CORE_UTIL_VALIDATION_ERRORS_H
 
 #include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include <map>
diff --git a/src/core/util/windows/directory_reader.cc b/src/core/util/windows/directory_reader.cc
index 02c7916798c..9ae07c6357b 100644
--- a/src/core/util/windows/directory_reader.cc
+++ b/src/core/util/windows/directory_reader.cc
@@ -29,7 +29,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/directory_reader.h"
 
 namespace grpc_core {
diff --git a/src/core/util/windows/stat.cc b/src/core/util/windows/stat.cc
index 8a08d087a5e..5ac15a407cf 100644
--- a/src/core/util/windows/stat.cc
+++ b/src/core/util/windows/stat.cc
@@ -24,7 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/stat.h"
 #include "src/core/util/strerror.h"
diff --git a/src/core/util/windows/string.cc b/src/core/util/windows/string.cc
index c95c4b3fb16..abe4d0a9867 100644
--- a/src/core/util/windows/string.cc
+++ b/src/core/util/windows/string.cc
@@ -22,13 +22,12 @@
 
 #ifdef GPR_WINDOWS_STRING
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/string.h"
 
 int gpr_asprintf(char** strp, const char* format, ...) {
diff --git a/src/core/util/windows/string_util.cc b/src/core/util/windows/string_util.cc
index 105ce0636c9..3cc97fbc2c0 100644
--- a/src/core/util/windows/string_util.cc
+++ b/src/core/util/windows/string_util.cc
@@ -24,17 +24,15 @@
 
 // Some platforms (namely msys) need wchar to be included BEFORE
 // anything else, especially strsafe.h.
-#include <wchar.h>
-
+#include <grpc/support/alloc.h>
+#include <grpc/support/log_windows.h>
+#include <grpc/support/string_util.h>
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <strsafe.h>
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log_windows.h>
-#include <grpc/support/string_util.h>
+#include <wchar.h>
 
 #include "src/core/util/string.h"
 #include "src/core/util/tchar.h"
diff --git a/src/core/util/windows/sync.cc b/src/core/util/windows/sync.cc
index 84c06503e2f..593037c5019 100644
--- a/src/core/util/windows/sync.cc
+++ b/src/core/util/windows/sync.cc
@@ -23,11 +23,10 @@
 #if defined(GPR_WINDOWS) && !defined(GPR_ABSEIL_SYNC) && \
     !defined(GPR_CUSTOM_SYNC)
 
-#include "absl/log/check.h"
-
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 void gpr_mu_init(gpr_mu* mu) {
diff --git a/src/core/util/windows/thd.cc b/src/core/util/windows/thd.cc
index 0423e21baa2..464d8a6d06c 100644
--- a/src/core/util/windows/thd.cc
+++ b/src/core/util/windows/thd.cc
@@ -21,16 +21,14 @@
 
 #ifdef GPR_WINDOWS
 
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/thd_id.h>
 #include <grpc/support/time.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
 #include "src/core/util/thd.h"
diff --git a/src/core/util/windows/time.cc b/src/core/util/windows/time.cc
index 62151a2b6a5..696083856a3 100644
--- a/src/core/util/windows/time.cc
+++ b/src/core/util/windows/time.cc
@@ -22,14 +22,12 @@
 
 #ifdef GPR_WINDOWS_TIME
 
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <process.h>
 #include <sys/timeb.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/time_precise.h"
 
diff --git a/src/core/util/windows/tmpfile.cc b/src/core/util/windows/tmpfile.cc
index 44119406582..9acbf77e57c 100644
--- a/src/core/util/windows/tmpfile.cc
+++ b/src/core/util/windows/tmpfile.cc
@@ -20,14 +20,13 @@
 
 #ifdef GPR_WINDOWS_TMPFILE
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <io.h>
 #include <stdio.h>
 #include <string.h>
 #include <tchar.h>
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/tchar.h"
 #include "src/core/util/tmpfile.h"
diff --git a/src/core/util/work_serializer.cc b/src/core/util/work_serializer.cc
index 35c509f5828..c9e0b1d9f45 100644
--- a/src/core/util/work_serializer.cc
+++ b/src/core/util/work_serializer.cc
@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/work_serializer.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,9 +31,6 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/core/util/work_serializer.h b/src/core/util/work_serializer.h
index 780fa4fb05e..d7bc41554d3 100644
--- a/src/core/util/work_serializer.h
+++ b/src/core/util/work_serializer.h
@@ -17,15 +17,13 @@
 #ifndef GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H
 #define GRPC_SRC_CORE_UTIL_WORK_SERIALIZER_H
 
+#include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
 #include <functional>
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/orphanable.h"
 
diff --git a/src/core/xds/grpc/certificate_provider_store.cc b/src/core/xds/grpc/certificate_provider_store.cc
index aef0c6c0783..1e7b9199d61 100644
--- a/src/core/xds/grpc/certificate_provider_store.cc
+++ b/src/core/xds/grpc/certificate_provider_store.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/xds/grpc/certificate_provider_store.h"
 
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/json.h>
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
diff --git a/src/core/xds/grpc/certificate_provider_store.h b/src/core/xds/grpc/certificate_provider_store.h
index 239d5ca74af..f5b01ca8a44 100644
--- a/src/core/xds/grpc/certificate_provider_store.h
+++ b/src/core/xds/grpc/certificate_provider_store.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
 #define GRPC_SRC_CORE_XDS_GRPC_CERTIFICATE_PROVIDER_STORE_H
 
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <string>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
index bbb76cfc22b..dd52e46d8e6 100644
--- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
+++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/xds/grpc/file_watcher_certificate_provider_factory.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <map>
 #include <memory>
@@ -26,10 +29,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
diff --git a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h
index 493e993648c..ab50c1844f4 100644
--- a/src/core/xds/grpc/file_watcher_certificate_provider_factory.h
+++ b/src/core/xds/grpc/file_watcher_certificate_provider_factory.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 #define GRPC_SRC_CORE_XDS_GRPC_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 
-#include <string>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
diff --git a/src/core/xds/grpc/xds_audit_logger_registry.cc b/src/core/xds/grpc/xds_audit_logger_registry.cc
index ef041a4c933..a57e4295d89 100644
--- a/src/core/xds/grpc/xds_audit_logger_registry.cc
+++ b/src/core/xds/grpc/xds_audit_logger_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
@@ -25,9 +27,6 @@
 #include "absl/types/optional.h"
 #include "envoy/config/core/v3/extension.upb.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/match.h"
 #include "src/core/util/validation_errors.h"
diff --git a/src/core/xds/grpc/xds_audit_logger_registry.h b/src/core/xds/grpc/xds_audit_logger_registry.h
index 92f7aadd302..cb35fd53d86 100644
--- a/src/core/xds/grpc/xds_audit_logger_registry.h
+++ b/src/core/xds/grpc/xds_audit_logger_registry.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_AUDIT_LOGGER_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/rbac/v3/rbac.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.cc b/src/core/xds/grpc/xds_bootstrap_grpc.cc
index 34fbd8f1331..227aafc77f7 100644
--- a/src/core/xds/grpc/xds_bootstrap_grpc.cc
+++ b/src/core/xds/grpc/xds_bootstrap_grpc.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <string>
@@ -30,10 +32,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/src/core/xds/grpc/xds_bootstrap_grpc.h b/src/core/xds/grpc/xds_bootstrap_grpc.h
index ba13d2bddf3..94a006a17b2 100644
--- a/src/core/xds/grpc/xds_bootstrap_grpc.h
+++ b/src/core/xds/grpc/xds_bootstrap_grpc.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_BOOTSTRAP_GRPC_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -25,9 +27,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
diff --git a/src/core/xds/grpc/xds_certificate_provider.cc b/src/core/xds/grpc/xds_certificate_provider.cc
index fecc658d364..bf73d434ec9 100644
--- a/src/core/xds/grpc/xds_certificate_provider.cc
+++ b/src/core/xds/grpc/xds_certificate_provider.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/xds/grpc/xds_certificate_provider.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <utility>
 
 #include "absl/functional/bind_front.h"
 #include "absl/log/check.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h
index 52b535af2db..1b916a879a4 100644
--- a/src/core/xds/grpc/xds_certificate_provider.h
+++ b/src/core/xds/grpc/xds_certificate_provider.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CERTIFICATE_PROVIDER_H
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -26,11 +30,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/util/matchers.h"
diff --git a/src/core/xds/grpc/xds_client_grpc.cc b/src/core/xds/grpc/xds_client_grpc.cc
index bc47f168b71..db3bcacb5ba 100644
--- a/src/core/xds/grpc/xds_client_grpc.cc
+++ b/src/core/xds/grpc/xds_client_grpc.cc
@@ -16,6 +16,13 @@
 
 #include "src/core/xds/grpc/xds_client_grpc.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <memory>
@@ -30,15 +37,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "envoy/service/status/v3/csds.upb.h"
-#include "upb/base/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
@@ -64,6 +62,7 @@
 #include "src/core/xds/xds_client/xds_channel_args.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "upb/base/string_view.h"
 
 // If gRPC is built with -DGRPC_XDS_USER_AGENT_NAME_SUFFIX="...", that string
 // will be appended to the user agent name reported to the xDS server.
diff --git a/src/core/xds/grpc/xds_client_grpc.h b/src/core/xds/grpc/xds_client_grpc.h
index bf6828f20f6..f52fdfc1dba 100644
--- a/src/core/xds/grpc/xds_client_grpc.h
+++ b/src/core/xds/grpc/xds_client_grpc.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc
index 09a7454d80f..b7633fa8fc7 100644
--- a/src/core/xds/grpc/xds_cluster.cc
+++ b/src/core/xds/grpc/xds_cluster.cc
@@ -18,7 +18,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/match.h"
 #include "src/core/util/time.h"
diff --git a/src/core/xds/grpc/xds_cluster.h b/src/core/xds/grpc/xds_cluster.h
index 7eea5d0b0fd..a2c6982acb1 100644
--- a/src/core/xds/grpc/xds_cluster.h
+++ b/src/core/xds/grpc/xds_cluster.h
@@ -23,7 +23,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
 #include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_common_types.h"
diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc
index 1a6bbc2e2b6..5d1ff0540e6 100644
--- a/src/core/xds/grpc/xds_cluster_parser.cc
+++ b/src/core/xds/grpc/xds_cluster_parser.cc
@@ -44,9 +44,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/text/encode.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
@@ -61,6 +58,8 @@
 #include "src/core/xds/grpc/xds_metadata_parser.h"
 #include "src/core/xds/xds_client/lrs_client.h"
 #include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
+#include "upb/base/string_view.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_cluster_parser.h b/src/core/xds/grpc/xds_cluster_parser.h
index 109818a079f..59981e8ec2e 100644
--- a/src/core/xds/grpc/xds_cluster_parser.h
+++ b/src/core/xds/grpc/xds_cluster_parser.h
@@ -22,12 +22,11 @@
 #include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h"
 #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/xds/grpc/xds_cluster.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.cc b/src/core/xds/grpc/xds_cluster_specifier_plugin.cc
index 8d77160224e..9e30ea84167 100644
--- a/src/core/xds/grpc/xds_cluster_specifier_plugin.cc
+++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>
@@ -25,17 +27,13 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/variant.h"
-#include "upb/base/status.hpp"
-#include "upb/json/encode.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upb.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upbdefs.h"
+#include "upb/base/status.hpp"
+#include "upb/json/encode.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_cluster_specifier_plugin.h b/src/core/xds/grpc/xds_cluster_specifier_plugin.h
index 4735ab749bc..4ae87310904 100644
--- a/src/core/xds/grpc/xds_cluster_specifier_plugin.h
+++ b/src/core/xds/grpc/xds_cluster_specifier_plugin.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_common_types.cc b/src/core/xds/grpc/xds_common_types.cc
index f1a84590602..0679d184b59 100644
--- a/src/core/xds/grpc/xds_common_types.cc
+++ b/src/core/xds/grpc/xds_common_types.cc
@@ -19,7 +19,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/match.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h
index 5bd838f1b77..b8c4ea1378d 100644
--- a/src/core/xds/grpc/xds_common_types.h
+++ b/src/core/xds/grpc/xds_common_types.h
@@ -22,7 +22,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/matchers.h"
 #include "src/core/util/validation_errors.h"
diff --git a/src/core/xds/grpc/xds_common_types_parser.cc b/src/core/xds/grpc/xds_common_types_parser.cc
index 8470b87d6b1..164fecc6728 100644
--- a/src/core/xds/grpc/xds_common_types_parser.cc
+++ b/src/core/xds/grpc/xds_common_types_parser.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -36,19 +38,15 @@
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/struct.upbdefs.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/base/status.hpp"
-#include "upb/json/encode.h"
-#include "upb/mem/arena.h"
-#include "xds/type/v3/typed_struct.upb.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/env.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/xds_client/xds_client.h"
+#include "upb/base/status.hpp"
+#include "upb/json/encode.h"
+#include "upb/mem/arena.h"
+#include "xds/type/v3/typed_struct.upb.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_common_types_parser.h b/src/core/xds/grpc/xds_common_types_parser.h
index 0db17b5f847..529e7abbd13 100644
--- a/src/core/xds/grpc/xds_common_types_parser.h
+++ b/src/core/xds/grpc/xds_common_types_parser.h
@@ -23,7 +23,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h
index 4a07e5871c0..a74541d2543 100644
--- a/src/core/xds/grpc/xds_endpoint.h
+++ b/src/core/xds/grpc/xds_endpoint.h
@@ -24,7 +24,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/random/random.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/xds/grpc/xds_endpoint_parser.cc b/src/core/xds/grpc/xds_endpoint_parser.cc
index bc11c1651e4..886052ae7cc 100644
--- a/src/core/xds/grpc/xds_endpoint_parser.cc
+++ b/src/core/xds/grpc/xds_endpoint_parser.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/xds/grpc/xds_endpoint_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -39,10 +40,6 @@
 #include "envoy/config/endpoint/v3/endpoint_components.upb.h"
 #include "envoy/type/v3/percent.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/text/encode.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -55,6 +52,7 @@
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_health_status.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/text/encode.h"
 
 // IWYU pragma: no_include "absl/meta/type_traits.h"
 
diff --git a/src/core/xds/grpc/xds_endpoint_parser.h b/src/core/xds/grpc/xds_endpoint_parser.h
index ababdd775bf..e543bab6356 100644
--- a/src/core/xds/grpc/xds_endpoint_parser.h
+++ b/src/core/xds/grpc/xds_endpoint_parser.h
@@ -19,12 +19,11 @@
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/endpoint/v3/endpoint.upbdefs.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/xds/grpc/xds_endpoint.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_health_status.h b/src/core/xds/grpc/xds_health_status.h
index 6f4e346a268..0f4c5bf0b00 100644
--- a/src/core/xds/grpc/xds_health_status.h
+++ b/src/core/xds/grpc/xds_health_status.h
@@ -22,7 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 
 // Channel arg key for xDS health status.
diff --git a/src/core/xds/grpc/xds_http_fault_filter.cc b/src/core/xds/grpc/xds_http_fault_filter.cc
index bf078f9d0d0..cc5b22bcb15 100644
--- a/src/core/xds/grpc/xds_http_fault_filter.cc
+++ b/src/core/xds/grpc/xds_http_fault_filter.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/xds/grpc/xds_http_fault_filter.h"
 
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
@@ -30,11 +33,6 @@
 #include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h"
 #include "envoy/type/v3/percent.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/xds/grpc/xds_http_fault_filter.h b/src/core/xds/grpc/xds_http_fault_filter.h
index d36b7761e17..0fb5d2b6c91 100644
--- a/src/core/xds/grpc/xds_http_fault_filter.h
+++ b/src/core/xds/grpc/xds_http_fault_filter.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_filter.h b/src/core/xds/grpc/xds_http_filter.h
index 888b5db75b0..4625b44ca3e 100644
--- a/src/core/xds/grpc/xds_http_filter.h
+++ b/src/core/xds/grpc/xds_http_filter.h
@@ -23,8 +23,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/transport/interception_chain.h"
@@ -33,6 +31,7 @@
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_filter_registry.cc b/src/core/xds/grpc/xds_http_filter_registry.cc
index 9decfded32d..38222b521af 100644
--- a/src/core/xds/grpc/xds_http_filter_registry.cc
+++ b/src/core/xds/grpc/xds_http_filter_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <utility>
 #include <vector>
@@ -24,9 +26,6 @@
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/router/v3/router.upb.h"
 #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/xds/grpc/xds_http_fault_filter.h"
 #include "src/core/xds/grpc/xds_http_gcp_authn_filter.h"
diff --git a/src/core/xds/grpc/xds_http_filter_registry.h b/src/core/xds/grpc/xds_http_filter_registry.h
index 79547d35d86..a34ad7625a7 100644
--- a/src/core/xds/grpc/xds_http_filter_registry.h
+++ b/src/core/xds/grpc/xds_http_filter_registry.h
@@ -26,8 +26,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/transport/interception_chain.h"
@@ -35,6 +33,7 @@
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc
index 72e964fe74a..11de97f5c6b 100644
--- a/src/core/xds/grpc/xds_http_gcp_authn_filter.cc
+++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_http_gcp_authn_filter.h"
 
+#include <grpc/support/json.h>
+
 #include <string>
 #include <utility>
 
@@ -24,9 +26,6 @@
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h"
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/xds/grpc/xds_http_gcp_authn_filter.h b/src/core/xds/grpc/xds_http_gcp_authn_filter.h
index 5a015e2ad81..11d07912bd2 100644
--- a/src/core/xds/grpc/xds_http_gcp_authn_filter.h
+++ b/src/core/xds/grpc/xds_http_gcp_authn_filter.h
@@ -20,14 +20,13 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_rbac_filter.cc b/src/core/xds/grpc/xds_http_rbac_filter.cc
index 381a2c31fdb..af819a7117e 100644
--- a/src/core/xds/grpc/xds_http_rbac_filter.cc
+++ b/src/core/xds/grpc/xds_http_rbac_filter.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_http_rbac_filter.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -38,11 +40,6 @@
 #include "envoy/type/matcher/v3/string.upb.h"
 #include "envoy/type/v3/range.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/message/map.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/rbac/rbac_filter.h"
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -55,6 +52,7 @@
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/xds_client/xds_client.h"
+#include "upb/message/map.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_rbac_filter.h b/src/core/xds/grpc/xds_http_rbac_filter.h
index 47a0f01c33c..b5533057750 100644
--- a/src/core/xds/grpc/xds_http_rbac_filter.h
+++ b/src/core/xds/grpc/xds_http_rbac_filter.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.cc b/src/core/xds/grpc/xds_http_stateful_session_filter.cc
index a1442a1f392..acdc66551de 100644
--- a/src/core/xds/grpc/xds_http_stateful_session_filter.cc
+++ b/src/core/xds/grpc/xds_http_stateful_session_filter.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/xds/grpc/xds_http_stateful_session_filter.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 #include <utility>
 
@@ -28,10 +31,6 @@
 #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upb.h"
 #include "envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h"
 #include "envoy/type/http/v3/cookie.upb.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/src/core/xds/grpc/xds_http_stateful_session_filter.h b/src/core/xds/grpc/xds_http_stateful_session_filter.h
index 8327a7759f0..6dccd4b1a19 100644
--- a/src/core/xds/grpc/xds_http_stateful_session_filter.h
+++ b/src/core/xds/grpc/xds_http_stateful_session_filter.h
@@ -17,19 +17,18 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_lb_policy_registry.cc b/src/core/xds/grpc/xds_lb_policy_registry.cc
index f126855eb2b..cff37249417 100644
--- a/src/core/xds/grpc/xds_lb_policy_registry.cc
+++ b/src/core/xds/grpc/xds_lb_policy_registry.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
 
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,10 +33,6 @@
 #include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h"
 #include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
 #include "src/core/util/time.h"
diff --git a/src/core/xds/grpc/xds_lb_policy_registry.h b/src/core/xds/grpc/xds_lb_policy_registry.h
index 2396cb8a88d..06dcaa19c75 100644
--- a/src/core/xds/grpc/xds_lb_policy_registry.h
+++ b/src/core/xds/grpc/xds_lb_policy_registry.h
@@ -17,14 +17,13 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
 
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "envoy/config/cluster/v3/cluster.upb.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc
index c67483c41a6..1bbff1e7918 100644
--- a/src/core/xds/grpc/xds_listener.cc
+++ b/src/core/xds/grpc/xds_listener.cc
@@ -19,7 +19,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/util/match.h"
 
diff --git a/src/core/xds/grpc/xds_listener.h b/src/core/xds/grpc/xds_listener.h
index 29b51923283..823a2a4f7f5 100644
--- a/src/core/xds/grpc/xds_listener.h
+++ b/src/core/xds/grpc/xds_listener.h
@@ -29,7 +29,6 @@
 
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/time.h"
 #include "src/core/xds/grpc/xds_common_types.h"
diff --git a/src/core/xds/grpc/xds_listener_parser.cc b/src/core/xds/grpc/xds_listener_parser.cc
index 3449b5875da..325705e30bb 100644
--- a/src/core/xds/grpc/xds_listener_parser.cc
+++ b/src/core/xds/grpc/xds_listener_parser.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/xds/grpc/xds_listener_parser.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <set>
@@ -43,10 +44,6 @@
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/wrappers.upb.h"
-#include "upb/text/encode.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
@@ -59,6 +56,7 @@
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_route_config_parser.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_listener_parser.h b/src/core/xds/grpc/xds_listener_parser.h
index 1a0e1e95004..908da7b995b 100644
--- a/src/core/xds/grpc/xds_listener_parser.h
+++ b/src/core/xds/grpc/xds_listener_parser.h
@@ -20,14 +20,13 @@
 #include "absl/strings/string_view.h"
 #include "envoy/config/listener/v3/listener.upbdefs.h"
 #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h"
-#include "upb/reflection/def.h"
-
 #include "src/core/xds/grpc/xds_bootstrap_grpc.h"
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 #include "src/core/xds/grpc/xds_listener.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_metadata.h b/src/core/xds/grpc/xds_metadata.h
index 94857712136..63e2178ffb0 100644
--- a/src/core/xds/grpc/xds_metadata.h
+++ b/src/core/xds/grpc/xds_metadata.h
@@ -24,7 +24,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/down_cast.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_writer.h"
diff --git a/src/core/xds/grpc/xds_metadata_parser.cc b/src/core/xds/grpc/xds_metadata_parser.cc
index cb355371c47..1ec9e7a106a 100644
--- a/src/core/xds/grpc/xds_metadata_parser.cc
+++ b/src/core/xds/grpc/xds_metadata_parser.cc
@@ -23,15 +23,14 @@
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h"
-#include "upb/base/string_view.h"
-#include "upb/text/encode.h"
-
 #include "src/core/util/env.h"
 #include "src/core/util/string.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
+#include "upb/base/string_view.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_metadata_parser.h b/src/core/xds/grpc/xds_metadata_parser.h
index a3cca589308..7cb9d55daa7 100644
--- a/src/core/xds/grpc/xds_metadata_parser.h
+++ b/src/core/xds/grpc/xds_metadata_parser.h
@@ -18,7 +18,6 @@
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_METADATA_PARSER_H
 
 #include "envoy/config/core/v3/base.upb.h"
-
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_metadata.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc
index 82d670207ee..5c94d6a8824 100644
--- a/src/core/xds/grpc/xds_route_config.cc
+++ b/src/core/xds/grpc/xds_route_config.cc
@@ -26,7 +26,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "re2/re2.h"
-
 #include "src/core/util/match.h"
 #include "src/core/util/matchers.h"
 
diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h
index b6af799af1c..8b562ecab11 100644
--- a/src/core/xds/grpc/xds_route_config.h
+++ b/src/core/xds/grpc/xds_route_config.h
@@ -28,7 +28,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "re2/re2.h"
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/matchers.h"
 #include "src/core/util/time.h"
diff --git a/src/core/xds/grpc/xds_route_config_parser.cc b/src/core/xds/grpc/xds_route_config_parser.cc
index 55ffc7ced1a..fc94e71e07b 100644
--- a/src/core/xds/grpc/xds_route_config_parser.cc
+++ b/src/core/xds/grpc/xds_route_config_parser.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/grpc/xds_route_config_parser.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -51,13 +53,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/wrappers.upb.h"
 #include "re2/re2.h"
-#include "upb/base/string_view.h"
-#include "upb/message/map.h"
-#include "upb/text/encode.h"
-
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
@@ -78,6 +73,9 @@
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
 #include "src/core/xds/grpc/xds_routing.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "upb/base/string_view.h"
+#include "upb/message/map.h"
+#include "upb/text/encode.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_route_config_parser.h b/src/core/xds/grpc/xds_route_config_parser.h
index 644c55e7198..d5909c9fcf8 100644
--- a/src/core/xds/grpc/xds_route_config_parser.h
+++ b/src/core/xds/grpc/xds_route_config_parser.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_PARSER_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTE_CONFIG_PARSER_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,10 +32,6 @@
 #include "envoy/config/route/v3/route.upb.h"
 #include "envoy/config/route/v3/route.upbdefs.h"
 #include "re2/re2.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
@@ -45,6 +42,7 @@
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/grpc/xds_routing.cc b/src/core/xds/grpc/xds_routing.cc
index 2d8668326be..95f6cb7446f 100644
--- a/src/core/xds/grpc/xds_routing.cc
+++ b/src/core/xds/grpc/xds_routing.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/xds/grpc/xds_routing.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -30,9 +31,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/matchers.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
diff --git a/src/core/xds/grpc/xds_routing.h b/src/core/xds/grpc/xds_routing.h
index 696599d8463..85309137635 100644
--- a/src/core/xds/grpc/xds_routing.h
+++ b/src/core/xds/grpc/xds_routing.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_ROUTING_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>
@@ -28,9 +29,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/xds/grpc/xds_http_filter_registry.h"
diff --git a/src/core/xds/grpc/xds_server_grpc.cc b/src/core/xds/grpc/xds_server_grpc.cc
index dca1d0b87c0..99654977e81 100644
--- a/src/core/xds/grpc/xds_server_grpc.cc
+++ b/src/core/xds/grpc/xds_server_grpc.cc
@@ -25,7 +25,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
diff --git a/src/core/xds/grpc/xds_transport_grpc.cc b/src/core/xds/grpc/xds_transport_grpc.cc
index 5bc75266959..ef0186a2f8a 100644
--- a/src/core/xds/grpc/xds_transport_grpc.cc
+++ b/src/core/xds/grpc/xds_transport_grpc.cc
@@ -16,16 +16,6 @@
 
 #include "src/core/xds/grpc/xds_transport_grpc.h"
 
-#include <string.h>
-
-#include <functional>
-#include <memory>
-#include <string_view>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/event_engine/event_engine.h>
@@ -35,7 +25,15 @@
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
+#include <functional>
+#include <memory>
+#include <string_view>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/src/core/xds/grpc/xds_transport_grpc.h b/src/core/xds/grpc/xds_transport_grpc.h
index 7615d19f6c8..b057c054ae3 100644
--- a/src/core/xds/grpc/xds_transport_grpc.h
+++ b/src/core/xds/grpc/xds_transport_grpc.h
@@ -17,18 +17,17 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_TRANSPORT_GRPC_H
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/core/xds/xds_client/lrs_client.cc b/src/core/xds/xds_client/lrs_client.cc
index d8059321d9e..3ff9d42c0a9 100644
--- a/src/core/xds/xds_client/lrs_client.cc
+++ b/src/core/xds/xds_client/lrs_client.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/xds_client/lrs_client.h"
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <memory>
 #include <set>
 #include <string>
@@ -31,13 +33,6 @@
 #include "envoy/service/load_stats/v3/lrs.upb.h"
 #include "envoy/service/load_stats/v3/lrs.upbdefs.h"
 #include "google/protobuf/duration.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-#include "upb/text/encode.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/backoff.h"
@@ -52,6 +47,10 @@
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_locality.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.h"
+#include "upb/text/encode.h"
 
 #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/xds/xds_client/lrs_client.h b/src/core/xds/xds_client/lrs_client.h
index 36fabc56fe3..eef921d953f 100644
--- a/src/core/xds/xds_client/lrs_client.h
+++ b/src/core/xds/xds_client/lrs_client.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_LRS_CLIENT_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <atomic>
 #include <map>
 #include <memory>
@@ -28,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/util/dual_ref_counted.h"
@@ -50,6 +48,7 @@
 #include "src/core/xds/xds_client/xds_metrics.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_api.cc b/src/core/xds/xds_client/xds_api.cc
index 50522961920..5223aa16795 100644
--- a/src/core/xds/xds_client/xds_api.cc
+++ b/src/core/xds/xds_client/xds_api.cc
@@ -16,6 +16,9 @@
 
 #include "src/core/xds/xds_client/xds_api.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -38,19 +41,14 @@
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/timestamp.upb.h"
 #include "google/rpc/status.upb.h"
+#include "src/core/util/json/json.h"
+#include "src/core/util/upb_utils.h"
+#include "src/core/xds/xds_client/xds_client.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.hpp"
 #include "upb/reflection/def.h"
 #include "upb/text/encode.h"
 
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
-#include "src/core/util/json/json.h"
-#include "src/core/util/upb_utils.h"
-#include "src/core/xds/xds_client/xds_client.h"
-
 // IWYU pragma: no_include "upb/msg_internal.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/xds_client/xds_api.h b/src/core/xds/xds_client/xds_api.h
index 207e78a297a..74d688dddef 100644
--- a/src/core/xds/xds_client/xds_api.h
+++ b/src/core/xds/xds_client/xds_api.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_API_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>
@@ -29,16 +30,13 @@
 #include "absl/strings/string_view.h"
 #include "envoy/admin/v3/config_dump_shared.upb.h"
 #include "envoy/service/status/v3/csds.upb.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_locality.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.cc b/src/core/xds/xds_client/xds_backend_metric_propagation.cc
index 1d514a0f25c..edb2f852f71 100644
--- a/src/core/xds/xds_client/xds_backend_metric_propagation.cc
+++ b/src/core/xds/xds_client/xds_backend_metric_propagation.cc
@@ -20,7 +20,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
-
 #include "src/core/util/useful.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/xds_client/xds_backend_metric_propagation.h b/src/core/xds/xds_client/xds_backend_metric_propagation.h
index 4216c0ac47e..3b9af885f71 100644
--- a/src/core/xds/xds_client/xds_backend_metric_propagation.h
+++ b/src/core/xds/xds_client/xds_backend_metric_propagation.h
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "absl/container/flat_hash_set.h"
-
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/core/xds/xds_client/xds_bootstrap.cc b/src/core/xds/xds_client/xds_bootstrap.cc
index b6f5edfc9e2..718ac64bab3 100644
--- a/src/core/xds/xds_client/xds_bootstrap.cc
+++ b/src/core/xds/xds_client/xds_bootstrap.cc
@@ -16,10 +16,9 @@
 
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 
-#include "absl/types/optional.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/types/optional.h"
 #include "src/core/util/env.h"
 #include "src/core/util/string.h"
 
diff --git a/src/core/xds/xds_client/xds_bootstrap.h b/src/core/xds/xds_client/xds_bootstrap.h
index cd802bbfa63..62f929b4c9d 100644
--- a/src/core/xds/xds_client/xds_bootstrap.h
+++ b/src/core/xds/xds_client/xds_bootstrap.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_BOOTSTRAP_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "src/core/util/json/json.h"
 
 namespace grpc_core {
diff --git a/src/core/xds/xds_client/xds_client.cc b/src/core/xds/xds_client/xds_client.cc
index 6381f8ba38c..d9b13e2980d 100644
--- a/src/core/xds/xds_client/xds_client.cc
+++ b/src/core/xds/xds_client/xds_client.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/xds/xds_client/xds_client.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -40,12 +42,6 @@
 #include "envoy/service/status/v3/csds.upb.h"
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/timestamp.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/debug_location.h"
@@ -57,6 +53,8 @@
 #include "src/core/xds/xds_client/xds_api.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_locality.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
 
 #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6
diff --git a/src/core/xds/xds_client/xds_client.h b/src/core/xds/xds_client/xds_client.h
index b5d4faa0b90..5b97b363d14 100644
--- a/src/core/xds/xds_client/xds_client.h
+++ b/src/core/xds/xds_client/xds_client.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <set>
@@ -28,11 +31,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/orphanable.h"
@@ -48,6 +46,7 @@
 #include "src/core/xds/xds_client/xds_metrics.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_transport.h"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_locality.h b/src/core/xds/xds_client/xds_locality.h
index 3223ff48c34..7fb469ba415 100644
--- a/src/core/xds/xds_client/xds_locality.h
+++ b/src/core/xds/xds_client/xds_locality.h
@@ -24,7 +24,6 @@
 
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/core/xds/xds_client/xds_metrics.h b/src/core/xds/xds_client/xds_metrics.h
index 5262e02e084..6e562296396 100644
--- a/src/core/xds/xds_client/xds_metrics.h
+++ b/src/core/xds/xds_client/xds_metrics.h
@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
+
 namespace grpc_core {
 
 // An interface for XdsClient to report metrics.
diff --git a/src/core/xds/xds_client/xds_resource_type.h b/src/core/xds/xds_client/xds_resource_type.h
index dade8ce0f83..642ff2e7119 100644
--- a/src/core/xds/xds_client/xds_resource_type.h
+++ b/src/core/xds/xds_client/xds_resource_type.h
@@ -16,19 +16,18 @@
 
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "upb/mem/arena.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "upb/mem/arena.h"
+#include "upb/reflection/def.h"
 
 namespace grpc_core {
 
diff --git a/src/core/xds/xds_client/xds_resource_type_impl.h b/src/core/xds/xds_client/xds_resource_type_impl.h
index a927f796b5e..0b97edb6aa0 100644
--- a/src/core/xds/xds_client/xds_resource_type_impl.h
+++ b/src/core/xds/xds_client/xds_resource_type_impl.h
@@ -16,13 +16,12 @@
 
 #ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
 #define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/xds/xds_client/xds_client.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
diff --git a/src/core/xds/xds_client/xds_transport.h b/src/core/xds/xds_client/xds_transport.h
index b471b31477c..9d7f98f6bf5 100644
--- a/src/core/xds/xds_client/xds_transport.h
+++ b/src/core/xds/xds_client/xds_transport.h
@@ -22,7 +22,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
diff --git a/src/cpp/client/call_credentials.cc b/src/cpp/client/call_credentials.cc
index 88ccd07ea1f..3ecc72d5980 100644
--- a/src/cpp/client/call_credentials.cc
+++ b/src/cpp/client/call_credentials.cc
@@ -12,12 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/security/credentials.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/security/credentials/credentials.h"
 
 namespace grpc {
diff --git a/src/cpp/client/channel_cc.cc b/src/cpp/client/channel_cc.cc
index 457f9db37aa..e99c416d175 100644
--- a/src/cpp/client/channel_cc.cc
+++ b/src/cpp/client/channel_cc.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <atomic>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/slice.h>
@@ -41,6 +32,14 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/slice.h>
 
+#include <atomic>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/iomgr.h"
 
 namespace grpc {
diff --git a/src/cpp/client/channel_credentials.cc b/src/cpp/client/channel_credentials.cc
index 321af7783da..e27643c2846 100644
--- a/src/cpp/client/channel_credentials.cc
+++ b/src/cpp/client/channel_credentials.cc
@@ -11,16 +11,16 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace grpc {
 
 ChannelCredentials::ChannelCredentials(grpc_channel_credentials* c_creds)
diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc
index ac480c87153..e338d440b9c 100644
--- a/src/cpp/client/client_context.cc
+++ b/src/cpp/client/client_context.cc
@@ -16,17 +16,6 @@
 //
 //
 
-#include <stdlib.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
@@ -40,7 +29,16 @@
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/client_interceptor.h>
+#include <stdlib.h>
+
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/src/cpp/client/create_channel.cc b/src/cpp/client/create_channel.cc
index a2db03ae9ea..5385e3094e0 100644
--- a/src/cpp/client/create_channel.cc
+++ b/src/cpp/client/create_channel.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/status.h>
 #include <grpcpp/channel.h>
@@ -31,6 +26,11 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/client/create_channel_internal.h"
 
 namespace grpc {
diff --git a/src/cpp/client/create_channel_internal.cc b/src/cpp/client/create_channel_internal.cc
index e54910f46a3..31b6fa013ab 100644
--- a/src/cpp/client/create_channel_internal.cc
+++ b/src/cpp/client/create_channel_internal.cc
@@ -18,13 +18,13 @@
 
 #include "src/cpp/client/create_channel_internal.h"
 
+#include <grpcpp/channel.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <grpcpp/channel.h>
-
 namespace grpc {
 
 std::shared_ptr<Channel> CreateChannelInternal(
diff --git a/src/cpp/client/create_channel_internal.h b/src/cpp/client/create_channel_internal.h
index 264ad575aac..02e555e77bb 100644
--- a/src/cpp/client/create_channel_internal.h
+++ b/src/cpp/client/create_channel_internal.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_SRC_CPP_CLIENT_CREATE_CHANNEL_INTERNAL_H
 #define GRPC_SRC_CPP_CLIENT_CREATE_CHANNEL_INTERNAL_H
 
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace grpc {
 
 std::shared_ptr<Channel> CreateChannelInternal(
diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc
index e1d6653ed55..9f25b4bfbb8 100644
--- a/src/cpp/client/create_channel_posix.cc
+++ b/src/cpp/client/create_channel_posix.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_posix.h>
@@ -30,6 +25,11 @@
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/client/create_channel_internal.h"
 
 namespace grpc {
diff --git a/src/cpp/client/cronet_credentials.cc b/src/cpp/client/cronet_credentials.cc
index da133a62f9c..0bae55aa657 100644
--- a/src/cpp/client/cronet_credentials.cc
+++ b/src/cpp/client/cronet_credentials.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_cronet.h>
 #include <grpcpp/channel.h>
@@ -29,6 +24,11 @@
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/client/create_channel_internal.h"
 
 namespace grpc {
diff --git a/src/cpp/client/global_callback_hook.cc b/src/cpp/client/global_callback_hook.cc
index 2431508b7b3..e117214d1cc 100644
--- a/src/cpp/client/global_callback_hook.cc
+++ b/src/cpp/client/global_callback_hook.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpcpp/support/global_callback_hook.h>
+
 #include <memory>
 
 #include "absl/base/no_destructor.h"
 #include "absl/log/check.h"
 
-#include <grpcpp/support/global_callback_hook.h>
-
 namespace grpc {
 
 static absl::NoDestructor<std::shared_ptr<GlobalCallbackHook>> g_callback_hook(
diff --git a/src/cpp/client/insecure_credentials.cc b/src/cpp/client/insecure_credentials.cc
index 0f3d000bd29..89dcadfc409 100644
--- a/src/cpp/client/insecure_credentials.cc
+++ b/src/cpp/client/insecure_credentials.cc
@@ -15,8 +15,6 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
@@ -24,6 +22,8 @@
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+
 namespace grpc {
 namespace {
 class InsecureChannelCredentialsImpl final : public ChannelCredentials {
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
index 5c1804fbc66..e46561afb64 100644
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@@ -18,19 +18,6 @@
 
 #include "src/cpp/client/secure_credentials.h"
 
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_join.h"
-#include "absl/types/optional.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
@@ -45,7 +32,18 @@
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
+#include <string.h>
+
+#include <map>
+#include <memory>
+#include <utility>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_join.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/security/util/json_util.h"
 #include "src/core/util/env.h"
diff --git a/src/cpp/client/xds_credentials.cc b/src/cpp/client/xds_credentials.cc
index e3fefd04c47..b9771e2d340 100644
--- a/src/cpp/client/xds_credentials.cc
+++ b/src/cpp/client/xds_credentials.cc
@@ -16,14 +16,14 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/credentials.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
+
 namespace grpc {
 class XdsChannelCredentialsImpl final : public ChannelCredentials {
  public:
diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc
index 770b07085e3..7617ca64670 100644
--- a/src/cpp/common/alarm.cc
+++ b/src/cpp/common/alarm.cc
@@ -15,14 +15,6 @@
 //
 //
 
-#include <atomic>
-#include <functional>
-#include <memory>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
@@ -32,6 +24,13 @@
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/completion_queue_tag.h>
 
+#include <atomic>
+#include <functional>
+#include <memory>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/status/status.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/src/cpp/common/alts_context.cc b/src/cpp/common/alts_context.cc
index b8fed615a42..cdcf53ee59e 100644
--- a/src/cpp/common/alts_context.cc
+++ b/src/cpp/common/alts_context.cc
@@ -16,19 +16,17 @@
 //
 //
 
+#include <grpc/grpc_security_constants.h>
+#include <grpcpp/security/alts_context.h>
 #include <stddef.h>
 
 #include <map>
 #include <string>
 
-#include "upb/base/string_view.h"
-#include "upb/message/map.h"
-
-#include <grpc/grpc_security_constants.h>
-#include <grpcpp/security/alts_context.h>
-
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 #include "src/proto/grpc/gcp/transport_security_common.upb.h"
+#include "upb/base/string_view.h"
+#include "upb/message/map.h"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/common/alts_util.cc b/src/cpp/common/alts_util.cc
index df1a8a8cf5b..1a0a2149b1f 100644
--- a/src/cpp/common/alts_util.cc
+++ b/src/cpp/common/alts_util.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/log/log.h"
-#include "upb/mem/arena.hpp"
-
 #include <grpc/grpc_security_constants.h>
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/alts_util.h>
@@ -31,8 +23,15 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/log/log.h"
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 #include "src/proto/grpc/gcp/altscontext.upb.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/common/auth_property_iterator.cc b/src/cpp/common/auth_property_iterator.cc
index 10e71d3a174..854e999115e 100644
--- a/src/cpp/common/auth_property_iterator.cc
+++ b/src/cpp/common/auth_property_iterator.cc
@@ -16,12 +16,12 @@
 //
 //
 
-#include <utility>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <utility>
+
 namespace grpc {
 
 AuthPropertyIterator::AuthPropertyIterator()
diff --git a/src/cpp/common/channel_arguments.cc b/src/cpp/common/channel_arguments.cc
index fc09938b99f..af1838571ca 100644
--- a/src/cpp/common/channel_arguments.cc
+++ b/src/cpp/common/channel_arguments.cc
@@ -15,19 +15,18 @@
 // limitations under the License.
 //
 //
-#include <algorithm>
-#include <list>
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/compression_types.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <algorithm>
+#include <list>
+#include <string>
+#include <vector>
+
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 
diff --git a/src/cpp/common/completion_queue_cc.cc b/src/cpp/common/completion_queue_cc.cc
index 88396bfbbc6..ebaf659acc2 100644
--- a/src/cpp/common/completion_queue_cc.cc
+++ b/src/cpp/common/completion_queue_cc.cc
@@ -15,12 +15,6 @@
 //
 //
 
-#include <vector>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/sync.h>
@@ -29,6 +23,11 @@
 #include <grpcpp/impl/completion_queue_tag.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include <vector>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
 #include "src/core/util/useful.h"
diff --git a/src/cpp/common/insecure_create_auth_context.cc b/src/cpp/common/insecure_create_auth_context.cc
index b4c02d39b36..785357e1806 100644
--- a/src/cpp/common/insecure_create_auth_context.cc
+++ b/src/cpp/common/insecure_create_auth_context.cc
@@ -15,11 +15,11 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <memory>
+
 namespace grpc {
 
 std::shared_ptr<const AuthContext> CreateAuthContext(grpc_call* call) {
diff --git a/src/cpp/common/resource_quota_cc.cc b/src/cpp/common/resource_quota_cc.cc
index 075a4f71d76..253edd04ba4 100644
--- a/src/cpp/common/resource_quota_cc.cc
+++ b/src/cpp/common/resource_quota_cc.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/resource_quota.h>
 #include <stddef.h>
 
 #include <string>
 
-#include <grpc/grpc.h>
-#include <grpcpp/resource_quota.h>
-
 namespace grpc {
 
 ResourceQuota::ResourceQuota() : impl_(grpc_resource_quota_create(nullptr)) {}
diff --git a/src/cpp/common/secure_auth_context.cc b/src/cpp/common/secure_auth_context.cc
index c1b69efe4d5..ccf362b58be 100644
--- a/src/cpp/common/secure_auth_context.cc
+++ b/src/cpp/common/secure_auth_context.cc
@@ -18,10 +18,10 @@
 
 #include "src/cpp/common/secure_auth_context.h"
 
-#include <algorithm>
-
 #include <grpc/grpc_security.h>
 
+#include <algorithm>
+
 namespace grpc {
 
 std::vector<grpc::string_ref> SecureAuthContext::GetPeerIdentity() const {
diff --git a/src/cpp/common/secure_auth_context.h b/src/cpp/common/secure_auth_context.h
index 8da3e971c22..405036faa05 100644
--- a/src/cpp/common/secure_auth_context.h
+++ b/src/cpp/common/secure_auth_context.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CPP_COMMON_SECURE_AUTH_CONTEXT_H
 #define GRPC_SRC_CPP_COMMON_SECURE_AUTH_CONTEXT_H
 
-#include <string>
-#include <vector>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <string>
+#include <vector>
+
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/cpp/common/secure_create_auth_context.cc b/src/cpp/common/secure_create_auth_context.cc
index 8492655b4aa..3c1caeaccb5 100644
--- a/src/cpp/common/secure_create_auth_context.cc
+++ b/src/cpp/common/secure_create_auth_context.cc
@@ -15,12 +15,12 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
 
+#include <memory>
+
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/cpp/common/secure_auth_context.h"
diff --git a/src/cpp/common/tls_certificate_provider.cc b/src/cpp/common/tls_certificate_provider.cc
index 88c684b3a45..091e478b9ba 100644
--- a/src/cpp/common/tls_certificate_provider.cc
+++ b/src/cpp/common/tls_certificate_provider.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/tls_certificate_provider.h>
 
+#include <string>
+#include <vector>
+
+#include "absl/log/check.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc {
diff --git a/src/cpp/common/tls_certificate_verifier.cc b/src/cpp/common/tls_certificate_verifier.cc
index d298cf26773..dfbd2e1c3e1 100644
--- a/src/cpp/common/tls_certificate_verifier.cc
+++ b/src/cpp/common/tls_certificate_verifier.cc
@@ -14,16 +14,6 @@
 // limitations under the License.
 //
 
-#include <stddef.h>
-
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
@@ -33,6 +23,15 @@
 #include <grpcpp/security/tls_certificate_verifier.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
+#include <stddef.h>
+
+#include <algorithm>
+#include <functional>
+#include <map>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/common/tls_credentials_options.cc b/src/cpp/common/tls_credentials_options.cc
index 74e74128322..339a714bd2d 100644
--- a/src/cpp/common/tls_credentials_options.cc
+++ b/src/cpp/common/tls_credentials_options.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <string>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
@@ -30,6 +25,11 @@
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/security/tls_crl_provider.h>
 
+#include <memory>
+#include <string>
+
+#include "absl/log/check.h"
+
 namespace grpc {
 namespace experimental {
 
diff --git a/src/cpp/common/validate_service_config.cc b/src/cpp/common/validate_service_config.cc
index f8f662d87b3..6869617036a 100644
--- a/src/cpp/common/validate_service_config.cc
+++ b/src/cpp/common/validate_service_config.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/support/validate_service_config.h>
+
 #include <string>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/support/validate_service_config.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 44824d66f72..dbfe28ab0a5 100644
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <string>
-
 #include <grpcpp/grpcpp.h>
 
+#include <string>
+
 namespace grpc {
 std::string Version() { return GRPC_CPP_VERSION_STRING; }
 }  // namespace grpc
diff --git a/src/cpp/ext/chaotic_good.cc b/src/cpp/ext/chaotic_good.cc
index 7268598118e..31c36231a9c 100644
--- a/src/cpp/ext/chaotic_good.cc
+++ b/src/cpp/ext/chaotic_good.cc
@@ -14,10 +14,10 @@
 
 #include "src/cpp/ext/chaotic_good.h"
 
-#include <memory>
-
 #include <grpc/grpc.h>
 
+#include <memory>
+
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 
diff --git a/src/cpp/ext/chaotic_good.h b/src/cpp/ext/chaotic_good.h
index b203f473e59..73fed2bd632 100644
--- a/src/cpp/ext/chaotic_good.h
+++ b/src/cpp/ext/chaotic_good.h
@@ -15,11 +15,11 @@
 #ifndef GRPC_SRC_CPP_EXT_CHAOTIC_GOOD_H
 #define GRPC_SRC_CPP_EXT_CHAOTIC_GOOD_H
 
-#include <memory>
-
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 namespace grpc {
 
 std::shared_ptr<ChannelCredentials> ChaoticGoodInsecureChannelCredentials();
diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc
index a5f61794660..66a2194f0e5 100644
--- a/src/cpp/ext/csm/csm_observability.cc
+++ b/src/cpp/ext/csm/csm_observability.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/csm/csm_observability.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/csm_observability.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -30,10 +33,6 @@
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/sdk/resource/resource_detector.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/csm_observability.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/uri.h"
 #include "src/core/xds/grpc/xds_enabled_server.h"
diff --git a/src/cpp/ext/csm/csm_observability.h b/src/cpp/ext/csm/csm_observability.h
index 8e623cb4edf..a42831a4f4a 100644
--- a/src/cpp/ext/csm/csm_observability.h
+++ b/src/cpp/ext/csm/csm_observability.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H
 #define GRPC_SRC_CPP_EXT_CSM_CSM_OBSERVABILITY_H
 
-#include "absl/strings/string_view.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc
index bd922460fb9..5934554d10d 100644
--- a/src/cpp/ext/csm/metadata_exchange.cc
+++ b/src/cpp/ext/csm/metadata_exchange.cc
@@ -18,6 +18,8 @@
 
 #include "src/cpp/ext/csm/metadata_exchange.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -34,11 +36,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "opentelemetry/sdk/resource/semantic_conventions.h"
-#include "upb/base/string_view.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/telemetry/call_tracer.h"
@@ -48,6 +45,7 @@
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/load_file.h"
 #include "src/cpp/ext/otel/key_value_iterable.h"
+#include "upb/base/string_view.h"
 
 namespace grpc {
 namespace internal {
diff --git a/src/cpp/ext/csm/metadata_exchange.h b/src/cpp/ext/csm/metadata_exchange.h
index 4487dcbb74e..0830acdd7ef 100644
--- a/src/cpp/ext/csm/metadata_exchange.h
+++ b/src/cpp/ext/csm/metadata_exchange.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H
 #define GRPC_SRC_CPP_EXT_CSM_METADATA_EXCHANGE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -27,13 +29,10 @@
 #include "absl/strings/string_view.h"
 #include "google/protobuf/struct.upb.h"
 #include "opentelemetry/sdk/common/attribute_utils.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace internal {
diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc
index 001c1fa8d18..d865b75147c 100644
--- a/src/cpp/ext/filters/census/client_filter.cc
+++ b/src/cpp/ext/filters/census/client_filter.cc
@@ -18,6 +18,12 @@
 
 #include "src/cpp/ext/filters/census/client_filter.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/support/status.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -42,14 +48,6 @@
 #include "opencensus/trace/span.h"
 #include "opencensus/trace/span_context.h"
 #include "opencensus/trace/status_code.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/cpp/ext/filters/census/client_filter.h b/src/cpp/ext/filters/census/client_filter.h
index 8e2f4057c3b..e1ee13b087f 100644
--- a/src/cpp/ext/filters/census/client_filter.h
+++ b/src/cpp/ext/filters/census/client_filter.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CLIENT_FILTER_H
 
-#include "absl/status/statusor.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/support/client_interceptor.h>
 #include <grpcpp/support/interceptor.h>
 
+#include "absl/status/statusor.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/src/cpp/ext/filters/census/context.cc b/src/cpp/ext/filters/census/context.cc
index 21d10f1fd28..2545b34e7ad 100644
--- a/src/cpp/ext/filters/census/context.cc
+++ b/src/cpp/ext/filters/census/context.cc
@@ -18,15 +18,14 @@
 
 #include "src/cpp/ext/filters/census/context.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <new>
 
 #include "opencensus/tags/context_util.h"
 #include "opencensus/tags/tag_map.h"
 #include "opencensus/trace/context_util.h"
 #include "opencensus/trace/propagation/grpc_trace_bin.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/transport/transport.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/cpp/ext/filters/census/rpc_encoding.h"
diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h
index 503823a427e..fcee9407139 100644
--- a/src/cpp/ext/filters/census/context.h
+++ b/src/cpp/ext/filters/census/context.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_CONTEXT_H
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,13 +31,6 @@
 #include "absl/strings/strip.h"
 #include "opencensus/trace/span.h"
 #include "opencensus/trace/span_context.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc
index f41d6d687e8..cb407b21cdb 100644
--- a/src/cpp/ext/filters/census/grpc_plugin.cc
+++ b/src/cpp/ext/filters/census/grpc_plugin.cc
@@ -18,17 +18,16 @@
 
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/server_context.h>
+
 #include <atomic>
 
 #include "absl/base/attributes.h"
 #include "absl/strings/string_view.h"
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/trace/span.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/surface/channel_stack_type.h"
diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h
index 553857c96b7..af647d33af1 100644
--- a/src/cpp/ext/filters/census/grpc_plugin.h
+++ b/src/cpp/ext/filters/census/grpc_plugin.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
+
 #include <algorithm>
 #include <map>
 #include <string>
@@ -30,9 +33,6 @@
 #include "opencensus/tags/tag_key.h"
 #include "opencensus/tags/tag_map.h"
 
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 namespace grpc {
 
 // The following using declarations have been added to prevent breaking users
diff --git a/src/cpp/ext/filters/census/measures.cc b/src/cpp/ext/filters/census/measures.cc
index 5710d04dc6e..c5f0d973d6e 100644
--- a/src/cpp/ext/filters/census/measures.cc
+++ b/src/cpp/ext/filters/census/measures.cc
@@ -18,11 +18,10 @@
 
 #include "src/cpp/ext/filters/census/measures.h"
 
-#include "opencensus/stats/stats.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/opencensus.h>
 
+#include "opencensus/stats/stats.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/filters/census/measures.h b/src/cpp/ext/filters/census/measures.h
index 78a58c6732a..5d0f39022c5 100644
--- a/src/cpp/ext/filters/census/measures.h
+++ b/src/cpp/ext/filters/census/measures.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_MEASURES_H
 
-#include "opencensus/stats/stats.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "opencensus/stats/stats.h"
+
 namespace grpc {
 
 ::opencensus::stats::MeasureInt64 RpcClientSentMessagesPerRpc();
diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h
index 2b98d4cb861..6b50bc0c756 100644
--- a/src/cpp/ext/filters/census/open_census_call_tracer.h
+++ b/src/cpp/ext/filters/census/open_census_call_tracer.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_OPEN_CENSUS_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <grpcpp/opencensus.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -33,11 +36,6 @@
 #include "opencensus/trace/span_context.h"
 #include "opencensus/trace/span_id.h"
 #include "opencensus/trace/trace_id.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/cpp/ext/filters/census/rpc_encoding.h b/src/cpp/ext/filters/census/rpc_encoding.h
index a42b4d8c9e6..ad474d81e1b 100644
--- a/src/cpp/ext/filters/census/rpc_encoding.h
+++ b/src/cpp/ext/filters/census/rpc_encoding.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H
 #define GRPC_SRC_CPP_EXT_FILTERS_CENSUS_RPC_ENCODING_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/base/internal/endian.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc {
 namespace internal {
 
diff --git a/src/cpp/ext/filters/census/server_call_tracer.cc b/src/cpp/ext/filters/census/server_call_tracer.cc
index e98b21ec0bc..bb6fb57f793 100644
--- a/src/cpp/ext/filters/census/server_call_tracer.cc
+++ b/src/cpp/ext/filters/census/server_call_tracer.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/filters/census/server_call_tracer.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -40,11 +43,6 @@
 #include "opencensus/trace/span_context.h"
 #include "opencensus/trace/span_id.h"
 #include "opencensus/trace/trace_id.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc
index 068c9089413..3fa27ff57a6 100644
--- a/src/cpp/ext/filters/census/views.cc
+++ b/src/cpp/ext/filters/census/views.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/opencensus.h>
+
 #include <vector>
 
 #include "absl/time/time.h"
 #include "opencensus/stats/stats.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/gcp/environment_autodetect.cc b/src/cpp/ext/gcp/environment_autodetect.cc
index 77f74608ee3..98365f3164f 100644
--- a/src/cpp/ext/gcp/environment_autodetect.cc
+++ b/src/cpp/ext/gcp/environment_autodetect.cc
@@ -18,6 +18,11 @@
 
 #include "src/cpp/ext/gcp/environment_autodetect.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include <memory>
 #include <utility>
 
@@ -27,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/src/cpp/ext/gcp/environment_autodetect.h b/src/cpp/ext/gcp/environment_autodetect.h
index b45eb9ed2c1..21ccfdf47a7 100644
--- a/src/cpp/ext/gcp/environment_autodetect.h
+++ b/src/cpp/ext/gcp/environment_autodetect.h
@@ -17,6 +17,9 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H
 #define GRPC_SRC_CPP_EXT_GCP_ENVIRONMENT_AUTODETECT_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -25,10 +28,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/gcp/observability.cc b/src/cpp/ext/gcp/observability.cc
index ef508c89dd9..ba60e112724 100644
--- a/src/cpp/ext/gcp/observability.cc
+++ b/src/cpp/ext/gcp/observability.cc
@@ -14,6 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -37,15 +44,6 @@
 #include "opencensus/stats/stats.h"
 #include "opencensus/trace/sampler.h"
 #include "opencensus/trace/trace_config.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
diff --git a/src/cpp/ext/gcp/observability_config.cc b/src/cpp/ext/gcp/observability_config.cc
index f6ffcf94d6a..64246249f01 100644
--- a/src/cpp/ext/gcp/observability_config.cc
+++ b/src/cpp/ext/gcp/observability_config.cc
@@ -16,6 +16,9 @@
 
 #include "src/cpp/ext/gcp/observability_config.h"
 
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,11 +30,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/error_utils.h"
diff --git a/src/cpp/ext/gcp/observability_config.h b/src/cpp/ext/gcp/observability_config.h
index 5fb18f3fae6..bc7d347a6e8 100644
--- a/src/cpp/ext/gcp/observability_config.h
+++ b/src/cpp/ext/gcp/observability_config.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H
 #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_CONFIG_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -26,9 +27,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
diff --git a/src/cpp/ext/gcp/observability_logging_sink.cc b/src/cpp/ext/gcp/observability_logging_sink.cc
index 0a370d87606..302cbc7be4d 100644
--- a/src/cpp/ext/gcp/observability_logging_sink.cc
+++ b/src/cpp/ext/gcp/observability_logging_sink.cc
@@ -18,6 +18,14 @@
 
 #include "src/cpp/ext/gcp/observability_logging_sink.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/status.h>
+
 #include <algorithm>
 #include <map>
 #include <utility>
@@ -33,15 +41,6 @@
 #include "google/logging/v2/logging.grpc.pb.h"
 #include "google/logging/v2/logging.pb.h"
 #include "google/protobuf/text_format.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/util/env.h"
 #include "src/core/util/json/json.h"
diff --git a/src/cpp/ext/gcp/observability_logging_sink.h b/src/cpp/ext/gcp/observability_logging_sink.h
index f4703721f3d..a61765118c2 100644
--- a/src/cpp/ext/gcp/observability_logging_sink.h
+++ b/src/cpp/ext/gcp/observability_logging_sink.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H
 #define GRPC_SRC_CPP_EXT_GCP_OBSERVABILITY_LOGGING_SINK_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <map>
@@ -30,10 +32,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "google/logging/v2/logging.grpc.pb.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/logging/logging_sink.h"
 #include "src/core/util/sync.h"
 #include "src/cpp/ext/gcp/environment_autodetect.h"
diff --git a/src/cpp/ext/otel/key_value_iterable.h b/src/cpp/ext/otel/key_value_iterable.h
index caad77aee36..b3d8d7d747f 100644
--- a/src/cpp/ext/otel/key_value_iterable.h
+++ b/src/cpp/ext/otel/key_value_iterable.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H
 #define GRPC_SRC_CPP_EXT_OTEL_KEY_VALUE_ITERABLE_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <utility>
@@ -31,9 +32,6 @@
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/ext/otel/otel_plugin.h"
 
 namespace grpc {
diff --git a/src/cpp/ext/otel/otel_client_call_tracer.cc b/src/cpp/ext/otel/otel_client_call_tracer.cc
index 88750fca3e3..bf5b3aba61f 100644
--- a/src/cpp/ext/otel/otel_client_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_client_call_tracer.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/otel/otel_client_call_tracer.h"
 
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <array>
@@ -38,11 +41,6 @@
 #include "absl/types/span.h"
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/metrics/sync_instruments.h"
-
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
diff --git a/src/cpp/ext/otel/otel_client_call_tracer.h b/src/cpp/ext/otel/otel_client_call_tracer.h
index c94219f2152..e489c7fa5f3 100644
--- a/src/cpp/ext/otel/otel_client_call_tracer.h
+++ b/src/cpp/ext/otel/otel_client_call_tracer.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_CLIENT_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <memory>
@@ -28,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc
index 7f71ec517f6..c55c4584358 100644
--- a/src/cpp/ext/otel/otel_plugin.cc
+++ b/src/cpp/ext/otel/otel_plugin.cc
@@ -18,6 +18,10 @@
 
 #include "src/cpp/ext/otel/otel_plugin.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/version_info.h>
+
 #include <memory>
 #include <type_traits>
 #include <utility>
@@ -29,11 +33,6 @@
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/version_info.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/src/cpp/ext/otel/otel_plugin.h b/src/cpp/ext/otel/otel_plugin.h
index 9b0c4328673..2199596ed62 100644
--- a/src/cpp/ext/otel/otel_plugin.h
+++ b/src/cpp/ext/otel/otel_plugin.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_PLUGIN_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/impl/server_builder_option.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -37,11 +40,6 @@
 #include "opentelemetry/metrics/observer_result.h"
 #include "opentelemetry/metrics/sync_instruments.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/impl/server_builder_option.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/telemetry/metrics.h"
diff --git a/src/cpp/ext/otel/otel_server_call_tracer.cc b/src/cpp/ext/otel/otel_server_call_tracer.cc
index 6fd4785672d..0e5d42febad 100644
--- a/src/cpp/ext/otel/otel_server_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_server_call_tracer.cc
@@ -18,6 +18,8 @@
 
 #include "src/cpp/ext/otel/otel_server_call_tracer.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <array>
 #include <memory>
 #include <string>
@@ -32,9 +34,6 @@
 #include "absl/types/span.h"
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/metrics/sync_instruments.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/src/cpp/ext/otel/otel_server_call_tracer.h b/src/cpp/ext/otel/otel_server_call_tracer.h
index 9d13d669b6d..b4f32f6ae84 100644
--- a/src/cpp/ext/otel/otel_server_call_tracer.h
+++ b/src/cpp/ext/otel/otel_server_call_tracer.h
@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H
 #define GRPC_SRC_CPP_EXT_OTEL_OTEL_SERVER_CALL_TRACER_H
 
-#include "absl/strings/strip.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/strings/strip.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
diff --git a/src/cpp/ext/proto_server_reflection.cc b/src/cpp/ext/proto_server_reflection.cc
index 95a30d892a9..075fc72ef3c 100644
--- a/src/cpp/ext/proto_server_reflection.cc
+++ b/src/cpp/ext/proto_server_reflection.cc
@@ -18,13 +18,13 @@
 
 #include "src/cpp/ext/proto_server_reflection.h"
 
-#include <unordered_set>
-#include <vector>
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/interceptor.h>
 #include <grpcpp/support/sync_stream.h>
 
+#include <unordered_set>
+#include <vector>
+
 // IWYU pragma: no_include "google/protobuf/descriptor.h"
 // IWYU pragma: no_include <google/protobuf/descriptor.h>
 // IWYU pragma: no_include "src/proto/grpc/reflection/v1/reflection.pb.h"
diff --git a/src/cpp/ext/proto_server_reflection.h b/src/cpp/ext/proto_server_reflection.h
index 989e0bd3e23..9f1ba787ff0 100644
--- a/src/cpp/ext/proto_server_reflection.h
+++ b/src/cpp/ext/proto_server_reflection.h
@@ -19,18 +19,18 @@
 #ifndef GRPC_SRC_CPP_EXT_PROTO_SERVER_REFLECTION_H
 #define GRPC_SRC_CPP_EXT_PROTO_SERVER_REFLECTION_H
 
-#include <memory>
-#include <string>
-#include <unordered_set>
-#include <utility>
-#include <vector>
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/support/config.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/sync_stream.h>
 
+#include <memory>
+#include <string>
+#include <unordered_set>
+#include <utility>
+#include <vector>
+
 #include "src/proto/grpc/reflection/v1/reflection.grpc.pb.h"
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
 
diff --git a/src/cpp/ext/proto_server_reflection_plugin.cc b/src/cpp/ext/proto_server_reflection_plugin.cc
index 4299884055d..d880fc127a1 100644
--- a/src/cpp/ext/proto_server_reflection_plugin.cc
+++ b/src/cpp/ext/proto_server_reflection_plugin.cc
@@ -16,14 +16,14 @@
 //
 //
 
-#include <memory>
-#include <string>
-
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server_builder.h>
 
+#include <memory>
+#include <string>
+
 #include "src/core/lib/config/config_vars.h"
 #include "src/cpp/ext/proto_server_reflection.h"
 
diff --git a/src/cpp/server/authorization_policy_provider.cc b/src/cpp/server/authorization_policy_provider.cc
index bc34cdf44f8..efd67c7d968 100644
--- a/src/cpp/server/authorization_policy_provider.cc
+++ b/src/cpp/server/authorization_policy_provider.cc
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-#include <string>
-
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/security/authorization_policy_provider.h>
 #include <grpcpp/support/status.h>
 
+#include <memory>
+#include <string>
+
 namespace grpc {
 namespace experimental {
 
diff --git a/src/cpp/server/backend_metric_recorder.cc b/src/cpp/server/backend_metric_recorder.cc
index 40a19f3a72f..6670878c7c2 100644
--- a/src/cpp/server/backend_metric_recorder.cc
+++ b/src/cpp/server/backend_metric_recorder.cc
@@ -16,6 +16,8 @@
 
 #include "src/cpp/server/backend_metric_recorder.h"
 
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/server_metric_recorder.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -25,10 +27,6 @@
 #include <utility>
 
 #include "absl/log/log.h"
-
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 
diff --git a/src/cpp/server/backend_metric_recorder.h b/src/cpp/server/backend_metric_recorder.h
index 0863d2b6a31..a556cb9b57f 100644
--- a/src/cpp/server/backend_metric_recorder.h
+++ b/src/cpp/server/backend_metric_recorder.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_SRC_CPP_SERVER_BACKEND_METRIC_RECORDER_H
 #define GRPC_SRC_CPP_SERVER_BACKEND_METRIC_RECORDER_H
 
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/server_metric_recorder.h>
+#include <grpcpp/impl/sync.h>
+#include <grpcpp/support/string_ref.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -26,12 +30,6 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-#include <grpcpp/impl/sync.h>
-#include <grpcpp/support/string_ref.h>
-
 #include "src/core/ext/filters/backend_metrics/backend_metric_provider.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 
diff --git a/src/cpp/server/channel_argument_option.cc b/src/cpp/server/channel_argument_option.cc
index 8ddad683cfd..957f99f79ed 100644
--- a/src/cpp/server/channel_argument_option.cc
+++ b/src/cpp/server/channel_argument_option.cc
@@ -16,15 +16,15 @@
 //
 //
 
-#include <memory>
-#include <string>
-#include <vector>
-
 #include <grpcpp/impl/channel_argument_option.h>
 #include <grpcpp/impl/server_builder_option.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace grpc {
 
 std::unique_ptr<ServerBuilderOption> MakeChannelArgumentOption(
diff --git a/src/cpp/server/channelz/channelz_service.cc b/src/cpp/server/channelz/channelz_service.cc
index 5b9b2ff2553..3d2dbfe089f 100644
--- a/src/cpp/server/channelz/channelz_service.cc
+++ b/src/cpp/server/channelz/channelz_service.cc
@@ -18,12 +18,12 @@
 
 #include "src/cpp/server/channelz/channelz_service.h"
 
-#include <memory>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 
+#include <memory>
+
 // IWYU pragma: no_include "google/protobuf/json/json.h"
 // IWYU pragma: no_include "google/protobuf/util/json_util.h"
 
diff --git a/src/cpp/server/channelz/channelz_service_plugin.cc b/src/cpp/server/channelz/channelz_service_plugin.cc
index a3d842ca145..e69b707e7bf 100644
--- a/src/cpp/server/channelz/channelz_service_plugin.cc
+++ b/src/cpp/server/channelz/channelz_service_plugin.cc
@@ -16,15 +16,15 @@
 //
 //
 
-#include <memory>
-#include <string>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/ext/channelz_service_plugin.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server_builder.h>
 
+#include <memory>
+#include <string>
+
 #include "src/cpp/server/channelz/channelz_service.h"
 
 namespace grpc {
diff --git a/src/cpp/server/csds/csds.cc b/src/cpp/server/csds/csds.cc
index d82d2b381c6..bda3a3e0112 100644
--- a/src/cpp/server/csds/csds.cc
+++ b/src/cpp/server/csds/csds.cc
@@ -18,17 +18,17 @@
 
 #include "src/cpp/server/csds/csds.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/support/interceptor.h>
+#include <grpcpp/support/slice.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/support/interceptor.h>
-#include <grpcpp/support/slice.h>
-
 namespace grpc {
 namespace xds {
 namespace experimental {
diff --git a/src/cpp/server/dynamic_thread_pool.h b/src/cpp/server/dynamic_thread_pool.h
index 30da5d1de52..90be3414c7f 100644
--- a/src/cpp/server/dynamic_thread_pool.h
+++ b/src/cpp/server/dynamic_thread_pool.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_SRC_CPP_SERVER_DYNAMIC_THREAD_POOL_H
 #define GRPC_SRC_CPP_SERVER_DYNAMIC_THREAD_POOL_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <functional>
 #include <memory>
 
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/cpp/server/thread_pool_interface.h"
 
diff --git a/src/cpp/server/external_connection_acceptor_impl.cc b/src/cpp/server/external_connection_acceptor_impl.cc
index 208ac0a37f2..5623dbfa36c 100644
--- a/src/cpp/server/external_connection_acceptor_impl.cc
+++ b/src/cpp/server/external_connection_acceptor_impl.cc
@@ -18,16 +18,16 @@
 
 #include "src/cpp/server/external_connection_acceptor_impl.h"
 
+#include <grpcpp/server_builder.h>
+#include <grpcpp/support/byte_buffer.h>
+#include <grpcpp/support/channel_arguments.h>
+
 #include <memory>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 
-#include <grpcpp/server_builder.h>
-#include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/channel_arguments.h>
-
 namespace grpc {
 namespace internal {
 namespace {
diff --git a/src/cpp/server/external_connection_acceptor_impl.h b/src/cpp/server/external_connection_acceptor_impl.h
index 3e23eb8a0c0..2ff036fe9ec 100644
--- a/src/cpp/server/external_connection_acceptor_impl.h
+++ b/src/cpp/server/external_connection_acceptor_impl.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CPP_SERVER_EXTERNAL_CONNECTION_ACCEPTOR_IMPL_H
 #define GRPC_SRC_CPP_SERVER_EXTERNAL_CONNECTION_ACCEPTOR_IMPL_H
 
-#include <memory>
-#include <string>
-
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <string>
+
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/util/sync.h"
 
diff --git a/src/cpp/server/health/default_health_check_service.cc b/src/cpp/server/health/default_health_check_service.cc
index 179bdf7a2ed..bb86083bb54 100644
--- a/src/cpp/server/health/default_health_check_service.cc
+++ b/src/cpp/server/health/default_health_check_service.cc
@@ -18,6 +18,11 @@
 
 #include "src/cpp/server/health/default_health_check_service.h"
 
+#include <grpc/slice.h>
+#include <grpcpp/impl/rpc_method.h>
+#include <grpcpp/impl/rpc_service_method.h>
+#include <grpcpp/impl/server_callback_handlers.h>
+#include <grpcpp/support/slice.h>
 #include <stdint.h>
 
 #include <memory>
@@ -25,17 +30,10 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
+#include "src/proto/grpc/health/v1/health.upb.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.hpp"
 
-#include <grpc/slice.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/support/slice.h>
-
-#include "src/proto/grpc/health/v1/health.upb.h"
-
 #define MAX_SERVICE_NAME_LENGTH 200
 
 namespace grpc {
diff --git a/src/cpp/server/health/default_health_check_service.h b/src/cpp/server/health/default_health_check_service.h
index 042b057b08f..3a12f66f3a6 100644
--- a/src/cpp/server/health/default_health_check_service.h
+++ b/src/cpp/server/health/default_health_check_service.h
@@ -19,14 +19,6 @@
 #ifndef GRPC_SRC_CPP_SERVER_HEALTH_DEFAULT_HEALTH_CHECK_SERVICE_H
 #define GRPC_SRC_CPP_SERVER_HEALTH_DEFAULT_HEALTH_CHECK_SERVICE_H
 
-#include <stddef.h>
-
-#include <map>
-#include <memory>
-#include <string>
-
-#include "absl/base/thread_annotations.h"
-
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/service_type.h>
@@ -34,7 +26,13 @@
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/status.h>
+#include <stddef.h>
 
+#include <map>
+#include <memory>
+#include <string>
+
+#include "absl/base/thread_annotations.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
 
diff --git a/src/cpp/server/health/health_check_service_server_builder_option.cc b/src/cpp/server/health/health_check_service_server_builder_option.cc
index c4eac98b470..d353c9c4129 100644
--- a/src/cpp/server/health/health_check_service_server_builder_option.cc
+++ b/src/cpp/server/health/health_check_service_server_builder_option.cc
@@ -16,15 +16,15 @@
 //
 //
 
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include <grpcpp/ext/health_check_service_server_builder_option.h>
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 namespace grpc {
 
 HealthCheckServiceServerBuilderOption::HealthCheckServiceServerBuilderOption(
diff --git a/src/cpp/server/insecure_server_credentials.cc b/src/cpp/server/insecure_server_credentials.cc
index a48b9cb93c7..3636fc057c8 100644
--- a/src/cpp/server/insecure_server_credentials.cc
+++ b/src/cpp/server/insecure_server_credentials.cc
@@ -16,13 +16,13 @@
 //
 //
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 namespace grpc {
 namespace {
 class InsecureServerCredentialsImpl final : public ServerCredentials {
diff --git a/src/cpp/server/load_reporter/constants.h b/src/cpp/server/load_reporter/constants.h
index 13b29946441..840a53b9c14 100644
--- a/src/cpp/server/load_reporter/constants.h
+++ b/src/cpp/server/load_reporter/constants.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_CONSTANTS_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc {
 namespace load_reporter {
 
diff --git a/src/cpp/server/load_reporter/get_cpu_stats.h b/src/cpp/server/load_reporter/get_cpu_stats.h
index 76d91ede495..876202cc148 100644
--- a/src/cpp/server/load_reporter/get_cpu_stats.h
+++ b/src/cpp/server/load_reporter/get_cpu_stats.h
@@ -19,12 +19,11 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_GET_CPU_STATS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc {
 namespace load_reporter {
 
diff --git a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
index 4742481c373..ee2fa144c16 100644
--- a/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
+++ b/src/cpp/server/load_reporter/get_cpu_stats_linux.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 
+#include <utility>
+
 #ifdef GPR_LINUX
 
 #include <inttypes.h>
diff --git a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc
index debc4a556b6..70b8c0851e3 100644
--- a/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc
+++ b/src/cpp/server/load_reporter/get_cpu_stats_unsupported.cc
@@ -21,7 +21,6 @@
 #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS) && !defined(GPR_APPLE)
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
 
diff --git a/src/cpp/server/load_reporter/load_data_store.cc b/src/cpp/server/load_reporter/load_data_store.cc
index 649c073efe1..5faa03a4fad 100644
--- a/src/cpp/server/load_reporter/load_data_store.cc
+++ b/src/cpp/server/load_reporter/load_data_store.cc
@@ -18,6 +18,7 @@
 
 #include "src/cpp/server/load_reporter/load_data_store.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -28,9 +29,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/socket_utils.h"
 #include "src/cpp/server/load_reporter/constants.h"
 
diff --git a/src/cpp/server/load_reporter/load_data_store.h b/src/cpp/server/load_reporter/load_data_store.h
index efb102c0909..e27b64ce2e7 100644
--- a/src/cpp/server/load_reporter/load_data_store.h
+++ b/src/cpp/server/load_reporter/load_data_store.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_DATA_STORE_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/support/config.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -28,9 +30,6 @@
 #include <unordered_map>
 #include <utility>
 
-#include <grpc/support/port_platform.h>
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 namespace load_reporter {
 
diff --git a/src/cpp/server/load_reporter/load_reporter.cc b/src/cpp/server/load_reporter/load_reporter.cc
index 6af88e8ba7f..c2aae6635fc 100644
--- a/src/cpp/server/load_reporter/load_reporter.cc
+++ b/src/cpp/server/load_reporter/load_reporter.cc
@@ -18,6 +18,7 @@
 
 #include "src/cpp/server/load_reporter/load_reporter.h"
 
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stdio.h>
 
@@ -30,9 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "opencensus/tags/tag_key.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/cpp/server/load_reporter/constants.h"
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
 
diff --git a/src/cpp/server/load_reporter/load_reporter.h b/src/cpp/server/load_reporter/load_reporter.h
index 4b08ca05bfc..b0123724b6a 100644
--- a/src/cpp/server/load_reporter/load_reporter.h
+++ b/src/cpp/server/load_reporter/load_reporter.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_H
 
+#include <google/protobuf/repeated_ptr_field.h>
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -31,13 +33,8 @@
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/repeated_ptr_field.h>
-
 #include "opencensus/stats/stats.h"
 #include "opencensus/tags/tag_key.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/sync.h"
 #include "src/cpp/server/load_reporter/load_data_store.h"
 #include "src/proto/grpc/lb/v1/load_reporter.grpc.pb.h"
diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
index fc452fc8ced..6b0adc5b254 100644
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.cc
@@ -18,17 +18,14 @@
 
 #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h"
 
-#include <inttypes.h>
-
 #include <google/protobuf/repeated_ptr_field.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 #include <grpcpp/support/status.h>
+#include <inttypes.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/cpp/server/load_reporter/constants.h"
 
 // IWYU pragma: no_include "google/protobuf/duration.pb.h"
diff --git a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
index 80210b4af7d..e5597a38188 100644
--- a/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
+++ b/src/cpp/server/load_reporter/load_reporter_async_service_impl.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTER_ASYNC_SERVICE_IMPL_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/async_stream.h>
+#include <grpcpp/support/interceptor.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -28,13 +33,6 @@
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/interceptor.h>
-
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
 #include "src/cpp/server/load_reporter/load_reporter.h"
diff --git a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc
index ec1926beb1a..665a63fbf9d 100644
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc
@@ -16,16 +16,16 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <vector>
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/ext/server_load_reporting.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <algorithm>
+#include <memory>
+#include <vector>
+
 #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h"
 
 namespace grpc {
diff --git a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc
index 766386178ed..248145aa311 100644
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.cc
@@ -18,12 +18,12 @@
 
 #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h"
 
-#include <utility>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server_builder.h>
 
+#include <utility>
+
 namespace grpc {
 namespace load_reporter {
 
diff --git a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
index c1370ec348e..7492fe22d6d 100644
--- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
+++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h
@@ -19,15 +19,15 @@
 #ifndef GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H
 #define GRPC_SRC_CPP_SERVER_LOAD_REPORTER_LOAD_REPORTING_SERVICE_SERVER_BUILDER_PLUGIN_H
 
-#include <memory>
-#include <string>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <string>
+
 #include "src/cpp/server/load_reporter/load_reporter_async_service_impl.h"
 
 namespace grpc {
diff --git a/src/cpp/server/load_reporter/util.cc b/src/cpp/server/load_reporter/util.cc
index 043d4ebb480..4d2ddc9c42c 100644
--- a/src/cpp/server/load_reporter/util.cc
+++ b/src/cpp/server/load_reporter/util.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/load_reporting.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/ext/server_load_reporting.h>
+#include <grpcpp/server_context.h>
 #include <string.h>
 
 #include <cmath>
@@ -23,11 +27,6 @@
 
 #include "absl/log/log.h"
 
-#include <grpc/load_reporting.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/ext/server_load_reporting.h>
-#include <grpcpp/server_context.h>
-
 namespace grpc {
 namespace load_reporter {
 namespace experimental {
diff --git a/src/cpp/server/orca/orca_service.cc b/src/cpp/server/orca/orca_service.cc
index 45829844e8f..6d5175d87e4 100644
--- a/src/cpp/server/orca/orca_service.cc
+++ b/src/cpp/server/orca/orca_service.cc
@@ -14,23 +14,6 @@
 // limitations under the License.
 //
 
-#include <stddef.h>
-
-#include <map>
-#include <memory>
-#include <utility>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
-#include "google/protobuf/duration.upb.h"
-#include "upb/base/string_view.h"
-#include "upb/mem/arena.hpp"
-#include "xds/data/orca/v3/orca_load_report.upb.h"
-#include "xds/service/orca/v3/orca.upb.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpcpp/ext/orca_service.h>
 #include <grpcpp/ext/server_metric_recorder.h>
@@ -43,7 +26,18 @@
 #include <grpcpp/support/server_callback.h>
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
+#include <stddef.h>
+
+#include <map>
+#include <memory>
+#include <utility>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/strings/string_view.h"
+#include "absl/time/time.h"
+#include "absl/types/optional.h"
+#include "google/protobuf/duration.upb.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/load_balancing/backend_metric_data.h"
@@ -52,6 +46,10 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/cpp/server/backend_metric_recorder.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.hpp"
+#include "xds/data/orca/v3/orca_load_report.upb.h"
+#include "xds/service/orca/v3/orca.upb.h"
 
 namespace grpc {
 namespace experimental {
diff --git a/src/cpp/server/secure_server_credentials.cc b/src/cpp/server/secure_server_credentials.cc
index 4a68e8e33c2..a522a9fdcdd 100644
--- a/src/cpp/server/secure_server_credentials.cc
+++ b/src/cpp/server/secure_server_credentials.cc
@@ -18,10 +18,6 @@
 
 #include "src/cpp/server/secure_server_credentials.h"
 
-#include <memory>
-#include <utility>
-#include <vector>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/status.h>
 #include <grpcpp/security/auth_metadata_processor.h>
@@ -30,6 +26,10 @@
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include "src/cpp/common/secure_auth_context.h"
 
 namespace grpc {
diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h
index 3167b257a4b..cb1b9927f77 100644
--- a/src/cpp/server/secure_server_credentials.h
+++ b/src/cpp/server/secure_server_credentials.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_SRC_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H
 #define GRPC_SRC_CPP_SERVER_SECURE_SERVER_CREDENTIALS_H
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_metadata_processor.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
 #include "src/cpp/server/thread_pool_interface.h"
 
 namespace grpc {
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index b20aa88113c..1e611449931 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -16,18 +16,6 @@
 //
 //
 
-#include <limits.h>
-#include <string.h>
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/compression_types.h>
@@ -47,7 +35,17 @@
 #include <grpcpp/server_interface.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/server_interceptor.h>
+#include <limits.h>
+#include <string.h>
 
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/ext/transport/chttp2/server/chttp2_server.h"
 #include "src/core/server/server.h"
 #include "src/core/util/string.h"
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 8996e78b4d8..49cb31dcb48 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -15,24 +15,6 @@
 //
 //
 
-#include <limits.h>
-#include <string.h>
-
-#include <algorithm>
-#include <atomic>
-#include <cstdlib>
-#include <memory>
-#include <new>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
@@ -67,7 +49,23 @@
 #include <grpcpp/support/server_interceptor.h>
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
+#include <limits.h>
+#include <string.h>
 
+#include <algorithm>
+#include <atomic>
+#include <cstdlib>
+#include <memory>
+#include <new>
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc
index ed1080aeaf6..ca8e3a4728f 100644
--- a/src/cpp/server/server_context.cc
+++ b/src/cpp/server/server_context.cc
@@ -17,22 +17,6 @@
 //
 
 #include <assert.h>
-
-#include <atomic>
-#include <cstdlib>
-#include <functional>
-#include <map>
-#include <memory>
-#include <new>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/compression_types.h>
@@ -56,6 +40,20 @@
 #include <grpcpp/support/server_interceptor.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <atomic>
+#include <cstdlib>
+#include <functional>
+#include <map>
+#include <memory>
+#include <new>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/util/crash.h"
diff --git a/src/cpp/server/xds_server_credentials.cc b/src/cpp/server/xds_server_credentials.cc
index df05e254d45..6ce2d70570b 100644
--- a/src/cpp/server/xds_server_credentials.cc
+++ b/src/cpp/server/xds_server_credentials.cc
@@ -16,14 +16,14 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
+
 namespace grpc {
 
 std::shared_ptr<ServerCredentials> XdsServerCredentials(
diff --git a/src/cpp/thread_manager/thread_manager.cc b/src/cpp/thread_manager/thread_manager.cc
index 3128e1c6f41..6cdf78c95bc 100644
--- a/src/cpp/thread_manager/thread_manager.cc
+++ b/src/cpp/thread_manager/thread_manager.cc
@@ -23,7 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/src/cpp/util/byte_buffer_cc.cc b/src/cpp/util/byte_buffer_cc.cc
index 687df553505..939e38d19e4 100644
--- a/src/cpp/util/byte_buffer_cc.cc
+++ b/src/cpp/util/byte_buffer_cc.cc
@@ -16,9 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <vector>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
@@ -28,6 +25,9 @@
 #include <grpcpp/support/slice.h>
 #include <grpcpp/support/status.h>
 
+#include <algorithm>
+#include <vector>
+
 namespace grpc {
 
 Status ByteBuffer::TrySingleSlice(Slice* slice) const {
diff --git a/src/cpp/util/status.cc b/src/cpp/util/status.cc
index 3fcaebf8ad0..7d2bdd5566d 100644
--- a/src/cpp/util/status.cc
+++ b/src/cpp/util/status.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <memory>
-
 #include <grpcpp/support/status.h>
 
+#include <memory>
+
 namespace grpc {
 
 const Status& Status::OK = Status();
diff --git a/src/cpp/util/string_ref.cc b/src/cpp/util/string_ref.cc
index 67b2e018a6f..ed60bc6683c 100644
--- a/src/cpp/util/string_ref.cc
+++ b/src/cpp/util/string_ref.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <stddef.h>
-
 #include <grpcpp/support/string_ref.h>
+#include <stddef.h>
 
 namespace grpc {
 
diff --git a/src/cpp/util/time_cc.cc b/src/cpp/util/time_cc.cc
index 458a0e0cf75..64e164a020c 100644
--- a/src/cpp/util/time_cc.cc
+++ b/src/cpp/util/time_cc.cc
@@ -16,12 +16,12 @@
 //
 //
 
-#include <chrono>
-#include <cstdint>
-
 #include <grpc/support/time.h>
 #include <grpcpp/support/time.h>
 
+#include <chrono>
+#include <cstdint>
+
 // IWYU pragma: no_include <ratio>
 
 using std::chrono::duration_cast;
diff --git a/src/objective-c/tests/CppCronetTests/TestHelper.h b/src/objective-c/tests/CppCronetTests/TestHelper.h
index 738161918ed..886c696eca2 100644
--- a/src/objective-c/tests/CppCronetTests/TestHelper.h
+++ b/src/objective-c/tests/CppCronetTests/TestHelper.h
@@ -20,15 +20,14 @@
 #define GRPC_TEST_CPP_IOS_CRONETTESTS_TESTHELPER_H
 
 #import <XCTest/XCTest.h>
-
-#import <map>
-#import <sstream>
-
 #import <grpc/support/time.h>
 #import <grpcpp/support/client_interceptor.h>
 #import <grpcpp/support/config.h>
 #import <grpcpp/support/string_ref.h>
 
+#import <map>
+#import <sstream>
+
 #import "src/proto/grpc/testing/echo.grpc.pb.h"
 
 const char* const kServerFinishAfterNReads = "server_finish_after_n_reads";
diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
index 21c6521f922..66b83488752 100644
--- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
+++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
@@ -14,6 +14,7 @@
 
 #include "client_call_tracer.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,9 +26,6 @@
 #include "metadata_exchange.h"
 #include "observability_util.h"
 #include "python_observability_context.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
index bb1b97813f5..34d7196ba74 100644
--- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
+++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_CLIENT_CALL_TRACER_H
 #define GRPC_PYTHON_OPENCENSUS_CLIENT_CALL_TRACER_H
 
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <atomic>
@@ -27,9 +28,6 @@
 #include "absl/time/time.h"
 #include "metadata_exchange.h"
 #include "python_observability_context.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/telemetry/call_tracer.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc b/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc
index b11ed1d9386..dae2f5e0edf 100644
--- a/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc
+++ b/src/python/grpcio_observability/grpc_observability/metadata_exchange.cc
@@ -18,6 +18,7 @@
 
 #include "metadata_exchange.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -27,9 +28,6 @@
 
 #include "absl/strings/string_view.h"
 #include "constants.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/telemetry/call_tracer.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/metadata_exchange.h b/src/python/grpcio_observability/grpc_observability/metadata_exchange.h
index dd971b6b1e5..592a78179a4 100644
--- a/src/python/grpcio_observability/grpc_observability/metadata_exchange.h
+++ b/src/python/grpcio_observability/grpc_observability/metadata_exchange.h
@@ -30,7 +30,6 @@
 #include "absl/strings/string_view.h"
 #include "constants.h"
 #include "python_observability_context.h"
-
 #include "src/core/lib/transport/metadata_batch.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/observability_util.h b/src/python/grpcio_observability/grpc_observability/observability_util.h
index e86ade06afd..5978e26c49f 100644
--- a/src/python/grpcio_observability/grpc_observability/observability_util.h
+++ b/src/python/grpcio_observability/grpc_observability/observability_util.h
@@ -15,6 +15,7 @@
 #ifndef OBSERVABILITY_MAIN_H
 #define OBSERVABILITY_MAIN_H
 
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -29,8 +30,6 @@
 #include "constants.h"
 #include "python_observability_context.h"
 
-#include <grpc/status.h>
-
 namespace grpc_observability {
 
 struct CensusData {
diff --git a/src/python/grpcio_observability/grpc_observability/python_observability_context.cc b/src/python/grpcio_observability/grpc_observability/python_observability_context.cc
index 5cc7c41beee..bca2455c87e 100644
--- a/src/python/grpcio_observability/grpc_observability/python_observability_context.cc
+++ b/src/python/grpcio_observability/grpc_observability/python_observability_context.cc
@@ -24,7 +24,6 @@
 #include "absl/random/random.h"
 #include "absl/strings/escaping.h"
 #include "rpc_encoding.h"
-
 #include "src/core/lib/transport/transport.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/python_observability_context.h b/src/python/grpcio_observability/grpc_observability/python_observability_context.h
index 16b05d63128..9c347098933 100644
--- a/src/python/grpcio_observability/grpc_observability/python_observability_context.h
+++ b/src/python/grpcio_observability/grpc_observability/python_observability_context.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_PYTHON_OBSERVABILITY_H
 #define GRPC_PYTHON_OBSERVABILITY_H
 
+#include <grpc/slice.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -29,9 +30,6 @@
 #include "absl/time/time.h"
 #include "constants.h"
 #include "sampler.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 
 namespace grpc_observability {
diff --git a/src/python/grpcio_observability/grpc_observability/rpc_encoding.h b/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
index 4fd5c94ea46..f73f4b84e18 100644
--- a/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
+++ b/src/python/grpcio_observability/grpc_observability/rpc_encoding.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H
 #define GRPC_PYTHON_OPENCENSUS_RPC_ENCODING_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/base/internal/endian.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_observability {
 
 // TODO(xuanwn): Reuse c++ rpc_encoding file.
diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
index bc19a8e672d..4695758b908 100644
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
@@ -14,6 +14,7 @@
 
 #include "server_call_tracer.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -32,9 +33,6 @@
 #include "constants.h"
 #include "observability_util.h"
 #include "python_observability_context.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
index f125b9cca62..ccb4a21bd3b 100644
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
@@ -15,6 +15,8 @@
 #ifndef GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H
 #define GRPC_PYTHON_OPENCENSUS_SERVER_CALL_TRACER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 
 #include "absl/strings/string_view.h"
@@ -22,9 +24,6 @@
 #include "constants.h"
 #include "metadata_exchange.h"
 #include "python_observability_context.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/src/ruby/ext/grpc/rb_byte_buffer.c b/src/ruby/ext/grpc/rb_byte_buffer.c
index ffd95330d2a..f71516f0bf8 100644
--- a/src/ruby/ext/grpc/rb_byte_buffer.c
+++ b/src/ruby/ext/grpc/rb_byte_buffer.c
@@ -20,13 +20,13 @@
 
 #include "rb_byte_buffer.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+
 grpc_byte_buffer* grpc_rb_s_to_byte_buffer(char* string, size_t length) {
   grpc_slice slice = grpc_slice_from_copied_buffer(string, length);
   grpc_byte_buffer* buffer = grpc_raw_byte_buffer_create(&slice, 1);
diff --git a/src/ruby/ext/grpc/rb_call.c b/src/ruby/ext/grpc/rb_call.c
index 2ef9b6a54f7..0f3b33da801 100644
--- a/src/ruby/ext/grpc/rb_call.c
+++ b/src/ruby/ext/grpc/rb_call.c
@@ -20,17 +20,17 @@
 
 #include "rb_call.h"
 
+#include <grpc/grpc.h>
+#include <grpc/impl/codegen/compression_types.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+
 #include "rb_byte_buffer.h"
 #include "rb_call_credentials.h"
 #include "rb_completion_queue.h"
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/grpc.h>
-#include <grpc/impl/codegen/compression_types.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cCall is the Call class whose instances proxy grpc_call. */
 static VALUE grpc_rb_cCall;
 
diff --git a/src/ruby/ext/grpc/rb_call_credentials.c b/src/ruby/ext/grpc/rb_call_credentials.c
index 8c69c82b1e3..9957f3937e7 100644
--- a/src/ruby/ext/grpc/rb_call_credentials.c
+++ b/src/ruby/ext/grpc/rb_call_credentials.c
@@ -20,6 +20,11 @@
 
 #include "rb_call_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 #include <ruby/thread.h>
 
 #include "rb_call.h"
@@ -27,12 +32,6 @@
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cCallCredentials is the ruby class that proxies
  * grpc_call_credentials */
 static VALUE grpc_rb_cCallCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_channel.c b/src/ruby/ext/grpc/rb_channel.c
index 2c800d8b9ec..76d2f39f17d 100644
--- a/src/ruby/ext/grpc/rb_channel.c
+++ b/src/ruby/ext/grpc/rb_channel.c
@@ -20,6 +20,12 @@
 
 #include "rb_channel.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <ruby/thread.h>
 
 #include "rb_byte_buffer.h"
@@ -32,13 +38,6 @@
 #include "rb_server.h"
 #include "rb_xds_channel_credentials.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 /* id_channel is the name of the hidden ivar that preserves a reference to the
  * channel on a call, so that calls are not GCed before their channel.  */
 static ID id_channel;
diff --git a/src/ruby/ext/grpc/rb_channel_args.c b/src/ruby/ext/grpc/rb_channel_args.c
index 4c252397e2a..d7f67297be6 100644
--- a/src/ruby/ext/grpc/rb_channel_args.c
+++ b/src/ruby/ext/grpc/rb_channel_args.c
@@ -20,14 +20,14 @@
 
 #include "rb_channel_args.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+
 static rb_data_type_t grpc_rb_channel_args_data_type = {
     "grpc_channel_args",
     {GRPC_RB_GC_NOT_MARKED,
diff --git a/src/ruby/ext/grpc/rb_channel_credentials.c b/src/ruby/ext/grpc/rb_channel_credentials.c
index e570bfb707f..9b1931954be 100644
--- a/src/ruby/ext/grpc/rb_channel_credentials.c
+++ b/src/ruby/ext/grpc/rb_channel_credentials.c
@@ -20,17 +20,16 @@
 
 #include "rb_channel_credentials.h"
 
-#include <string.h>
-
-#include "rb_call_credentials.h"
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <string.h>
+
+#include "rb_call_credentials.h"
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
 
 /* grpc_rb_cChannelCredentials is the ruby class that proxies
    grpc_channel_credentials. */
diff --git a/src/ruby/ext/grpc/rb_channel_credentials.h b/src/ruby/ext/grpc/rb_channel_credentials.h
index 75bda4b25ad..ecc02e449ba 100644
--- a/src/ruby/ext/grpc/rb_channel_credentials.h
+++ b/src/ruby/ext/grpc/rb_channel_credentials.h
@@ -21,9 +21,8 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby ChannelCredentials class. */
 void Init_grpc_channel_credentials();
diff --git a/src/ruby/ext/grpc/rb_completion_queue.c b/src/ruby/ext/grpc/rb_completion_queue.c
index 6a4bb9c3072..91047ec14cc 100644
--- a/src/ruby/ext/grpc/rb_completion_queue.c
+++ b/src/ruby/ext/grpc/rb_completion_queue.c
@@ -20,15 +20,14 @@
 
 #include "rb_completion_queue.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <ruby/thread.h>
 
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 /* Used to allow grpc_completion_queue_next call to release the GIL */
 typedef struct next_call_stack {
   grpc_completion_queue* cq;
diff --git a/src/ruby/ext/grpc/rb_compression_options.c b/src/ruby/ext/grpc/rb_compression_options.c
index a38790faf79..062d5362c3e 100644
--- a/src/ruby/ext/grpc/rb_compression_options.c
+++ b/src/ruby/ext/grpc/rb_compression_options.c
@@ -20,12 +20,6 @@
 
 #include "rb_compression_options.h"
 
-#include <string.h>
-
-#include "rb_byte_buffer.h"
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/impl/codegen/compression_types.h>
@@ -33,6 +27,11 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
+
+#include "rb_byte_buffer.h"
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
 
 static VALUE grpc_rb_cCompressionOptions = Qnil;
 
diff --git a/src/ruby/ext/grpc/rb_event_thread.c b/src/ruby/ext/grpc/rb_event_thread.c
index 0d7ec2ea2f4..014dd2dcd88 100644
--- a/src/ruby/ext/grpc/rb_event_thread.c
+++ b/src/ruby/ext/grpc/rb_event_thread.c
@@ -20,17 +20,16 @@
 
 #include "rb_event_thread.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <ruby/thread.h>
 #include <stdbool.h>
 
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 typedef struct grpc_rb_event {
   // callback will be called with argument while holding the GVL
   void (*callback)(void*);
diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c
index b26ddf357c0..ac66b590782 100644
--- a/src/ruby/ext/grpc/rb_grpc.c
+++ b/src/ruby/ext/grpc/rb_grpc.c
@@ -20,6 +20,9 @@
 
 #include "rb_grpc.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <math.h>
 #include <ruby/vm.h>
 #include <stdbool.h>
@@ -39,10 +42,6 @@
 #include "rb_xds_channel_credentials.h"
 #include "rb_xds_server_credentials.h"
 
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #ifdef GPR_LINUX
 #include <sys/syscall.h>
 #include <unistd.h>
diff --git a/src/ruby/ext/grpc/rb_grpc.h b/src/ruby/ext/grpc/rb_grpc.h
index 7518b79e390..01b7e0d4c78 100644
--- a/src/ruby/ext/grpc/rb_grpc.h
+++ b/src/ruby/ext/grpc/rb_grpc.h
@@ -21,9 +21,8 @@
 
 #include <ruby/ruby.h>
 
-#include <stdlib.h>
-
 #include <grpc/support/time.h>
+#include <stdlib.h>
 
 /* grpc_rb_mGrpcCore is the module containing the ruby wrapper GRPC classes. */
 extern VALUE grpc_rb_mGrpcCore;
diff --git a/src/ruby/ext/grpc/rb_server.c b/src/ruby/ext/grpc/rb_server.c
index 09e8788b9ed..f80b40ae70e 100644
--- a/src/ruby/ext/grpc/rb_server.c
+++ b/src/ruby/ext/grpc/rb_server.c
@@ -20,6 +20,12 @@
 
 #include "rb_server.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/log.h>
+
 #include "rb_byte_buffer.h"
 #include "rb_call.h"
 #include "rb_channel_args.h"
@@ -29,12 +35,6 @@
 #include "rb_server_credentials.h"
 #include "rb_xds_server_credentials.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cServer is the ruby class that proxies grpc_server. */
 static VALUE grpc_rb_cServer = Qnil;
 
diff --git a/src/ruby/ext/grpc/rb_server_credentials.c b/src/ruby/ext/grpc/rb_server_credentials.c
index 73c754d5352..121f888f897 100644
--- a/src/ruby/ext/grpc/rb_server_credentials.c
+++ b/src/ruby/ext/grpc/rb_server_credentials.c
@@ -20,14 +20,14 @@
 
 #include "rb_server_credentials.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+
 /* grpc_rb_cServerCredentials is the ruby class that proxies
    grpc_server_credentials. */
 static VALUE grpc_rb_cServerCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_server_credentials.h b/src/ruby/ext/grpc/rb_server_credentials.h
index 64b22715d99..35db1ed328f 100644
--- a/src/ruby/ext/grpc/rb_server_credentials.h
+++ b/src/ruby/ext/grpc/rb_server_credentials.h
@@ -21,10 +21,9 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby ServerCredentials class. */
 void Init_grpc_server_credentials();
diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.c b/src/ruby/ext/grpc/rb_xds_channel_credentials.c
index 56b08d99287..124bc8b3378 100644
--- a/src/ruby/ext/grpc/rb_xds_channel_credentials.c
+++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.c
@@ -20,6 +20,11 @@
 
 #include "rb_xds_channel_credentials.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/log.h>
 #include <string.h>
 
 #include "rb_call_credentials.h"
@@ -27,12 +32,6 @@
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-
 /* grpc_rb_cXdsChannelCredentials is the ruby class that proxies
    grpc_channel_credentials. */
 static VALUE grpc_rb_cXdsChannelCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_xds_channel_credentials.h b/src/ruby/ext/grpc/rb_xds_channel_credentials.h
index 5eba040ba17..a66f974413b 100644
--- a/src/ruby/ext/grpc/rb_xds_channel_credentials.h
+++ b/src/ruby/ext/grpc/rb_xds_channel_credentials.h
@@ -21,9 +21,8 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby ChannelCredentials class. */
 void Init_grpc_xds_channel_credentials();
diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.c b/src/ruby/ext/grpc/rb_xds_server_credentials.c
index 8186d0eb49e..703e3e99b4b 100644
--- a/src/ruby/ext/grpc/rb_xds_server_credentials.c
+++ b/src/ruby/ext/grpc/rb_xds_server_credentials.c
@@ -20,15 +20,15 @@
 
 #include "rb_xds_server_credentials.h"
 
-#include "rb_grpc.h"
-#include "rb_grpc_imports.generated.h"
-#include "rb_server_credentials.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/log.h>
 
+#include "rb_grpc.h"
+#include "rb_grpc_imports.generated.h"
+#include "rb_server_credentials.h"
+
 /* grpc_rb_cXdsServerCredentials is the ruby class that proxies
    grpc_server_credentials. */
 static VALUE grpc_rb_cXdsServerCredentials = Qnil;
diff --git a/src/ruby/ext/grpc/rb_xds_server_credentials.h b/src/ruby/ext/grpc/rb_xds_server_credentials.h
index 3ec1ced8e4b..59de9824a63 100644
--- a/src/ruby/ext/grpc/rb_xds_server_credentials.h
+++ b/src/ruby/ext/grpc/rb_xds_server_credentials.h
@@ -21,10 +21,9 @@
 
 #include <ruby/ruby.h>
 
-#include <stdbool.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
+#include <stdbool.h>
 
 /* Initializes the ruby XdsServerCredentials class. */
 void Init_grpc_xds_server_credentials();
diff --git a/test/core/address_utils/parse_address_test.cc b/test/core/address_utils/parse_address_test.cc
index 41b9df4bd5d..3bc09f0490a 100644
--- a/test/core/address_utils/parse_address_test.cc
+++ b/test/core/address_utils/parse_address_test.cc
@@ -32,15 +32,14 @@
 #include <linux/vm_sockets.h>
 #endif
 
+#include <grpc/grpc.h>
+
 #include <string>
 
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc
index c8e85ad1e26..0924eb2b33f 100644
--- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc
+++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc
@@ -16,16 +16,17 @@
 //
 //
 
+#include <grpc/support/alloc.h>
 #include <inttypes.h>
 #include <net/if.h>
 #include <netdb.h>
 #include <string.h>
-
-#include <grpc/support/alloc.h>
 #ifdef GRPC_HAVE_UNIX_SOCKET
 #include <sys/un.h>
 #endif
 
+#include <grpc/grpc.h>
+
 #include <string>
 
 #include "absl/log/log.h"
@@ -33,9 +34,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc
index 8c63854a203..08b80672f16 100644
--- a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc
+++ b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc
@@ -21,7 +21,6 @@
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/address_utils/sockaddr_utils_test.cc b/test/core/address_utils/sockaddr_utils_test.cc
index 83de472f102..234e4fe9896 100644
--- a/test/core/address_utils/sockaddr_utils_test.cc
+++ b/test/core/address_utils/sockaddr_utils_test.cc
@@ -17,6 +17,7 @@
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 
 #include <errno.h>
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -24,9 +25,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #ifdef GRPC_HAVE_UNIX_SOCKET
@@ -43,7 +41,6 @@
 #include <string>
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc
index f338e2dc0a4..83c05a2ad9b 100644
--- a/test/core/bad_client/bad_client.cc
+++ b/test/core/bad_client/bad_client.cc
@@ -18,18 +18,16 @@
 
 #include "test/core/bad_client/bad_client.h"
 
-#include <inttypes.h>
-#include <limits.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <limits.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h
index 57a8d92c6e6..fba8a07b354 100644
--- a/test/core/bad_client/bad_client.h
+++ b/test/core/bad_client/bad_client.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
 #define GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H
 
-#include <stddef.h>
-#include <stdint.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar"
 #define GRPC_BAD_CLIENT_REGISTERED_HOST "localhost"
diff --git a/test/core/bad_client/tests/bad_streaming_id.cc b/test/core/bad_client/tests/bad_streaming_id.cc
index 4cd7cbc5778..a8018ae6acd 100644
--- a/test/core/bad_client/tests/bad_streaming_id.cc
+++ b/test/core/bad_client/tests/bad_streaming_id.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <memory>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include "absl/log/check.h"
-
-#include <grpc/grpc.h>
+#include <memory>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc
index 27a01496d97..7cfa2ace385 100644
--- a/test/core/bad_client/tests/badreq.cc
+++ b/test/core/bad_client/tests/badreq.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/connection_prefix.cc b/test/core/bad_client/tests/connection_prefix.cc
index 1aa899ab707..c1c34a25d94 100644
--- a/test/core/bad_client/tests/connection_prefix.cc
+++ b/test/core/bad_client/tests/connection_prefix.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc
index b31c9663218..919ae4eeefb 100644
--- a/test/core/bad_client/tests/duplicate_header.cc
+++ b/test/core/bad_client/tests/duplicate_header.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/util/time.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc
index 2a46c836780..bce31bc893d 100644
--- a/test/core/bad_client/tests/head_of_line_blocking.cc
+++ b/test/core/bad_client/tests/head_of_line_blocking.cc
@@ -16,18 +16,16 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <algorithm>
 
 #include "absl/log/check.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/headers.cc b/test/core/bad_client/tests/headers.cc
index 0aa31a507c3..468f19a34d1 100644
--- a/test/core/bad_client/tests/headers.cc
+++ b/test/core/bad_client/tests/headers.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc
index deca4fdaebd..d4231c9c373 100644
--- a/test/core/bad_client/tests/initial_settings_frame.cc
+++ b/test/core/bad_client/tests/initial_settings_frame.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
diff --git a/test/core/bad_client/tests/out_of_bounds.cc b/test/core/bad_client/tests/out_of_bounds.cc
index 04cdf739c41..9abb44f777c 100644
--- a/test/core/bad_client/tests/out_of_bounds.cc
+++ b/test/core/bad_client/tests/out_of_bounds.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <string>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include "absl/log/check.h"
-
-#include <grpc/grpc.h>
+#include <string>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc
index 731eeb91acc..04adbc14a16 100644
--- a/test/core/bad_client/tests/server_registered_method.cc
+++ b/test/core/bad_client/tests/server_registered_method.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc
index 6732d76147d..52db06cccb3 100644
--- a/test/core/bad_client/tests/simple_request.cc
+++ b/test/core/bad_client/tests/simple_request.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc
index a7c908ca483..1357b3208af 100644
--- a/test/core/bad_client/tests/unknown_frame.cc
+++ b/test/core/bad_client/tests/unknown_frame.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <string>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include "absl/log/check.h"
-
-#include <grpc/grpc.h>
+#include <string>
 
+#include "absl/log/check.h"
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc
index 3137921591e..6cf962bb42a 100644
--- a/test/core/bad_client/tests/window_overflow.cc
+++ b/test/core/bad_client/tests/window_overflow.cc
@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <algorithm>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/server/server.h"
 #include "test/core/bad_client/bad_client.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/bad_connection/close_fd_test.cc b/test/core/bad_connection/close_fd_test.cc
index 41bd7021a0f..258a4cbe30e 100644
--- a/test/core/bad_connection/close_fd_test.cc
+++ b/test/core/bad_connection/close_fd_test.cc
@@ -21,19 +21,17 @@
 // an RPC call is in progress.
 //
 //
-#include <stdint.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <stdint.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/endpoint.h"
@@ -49,12 +47,11 @@
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_TCP
 
-#include <string.h>
-#include <unistd.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc
index 51fad155944..d7a367c5868 100644
--- a/test/core/bad_ssl/bad_ssl_test.cc
+++ b/test/core/bad_ssl/bad_ssl_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <string>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -33,7 +26,12 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <stdio.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
 #include "src/core/util/env.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/subprocess.h"
diff --git a/test/core/bad_ssl/server_common.cc b/test/core/bad_ssl/server_common.cc
index e76708b1969..a503b1dc835 100644
--- a/test/core/bad_ssl/server_common.cc
+++ b/test/core/bad_ssl/server_common.cc
@@ -18,13 +18,11 @@
 
 #include "test/core/bad_ssl/server_common.h"
 
+#include <grpc/support/time.h>
 #include <signal.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-
 #include "test/core/test_util/cmdline.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/bad_ssl/servers/alpn.cc b/test/core/bad_ssl/servers/alpn.cc
index 285488747c8..af6bebf6213 100644
--- a/test/core/bad_ssl/servers/alpn.cc
+++ b/test/core/bad_ssl/servers/alpn.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/useful.h"
 #include "test/core/bad_ssl/server_common.h"
diff --git a/test/core/bad_ssl/servers/cert.cc b/test/core/bad_ssl/servers/cert.cc
index 30d1b7fc8fd..e7f37f0a011 100644
--- a/test/core/bad_ssl/servers/cert.cc
+++ b/test/core/bad_ssl/servers/cert.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/error.h"
 #include "test/core/bad_ssl/server_common.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/core/call/batch_builder.h b/test/core/call/batch_builder.h
index 40202ea25dc..fec948b8b62 100644
--- a/test/core/call/batch_builder.h
+++ b/test/core/call/batch_builder.h
@@ -17,7 +17,6 @@
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/slice/slice.h"
 #include "test/core/end2end/cq_verifier.h"
 
diff --git a/test/core/call/bm_client_call.cc b/test/core/call/bm_client_call.cc
index 78e4a2a4196..b79ae1f9caf 100644
--- a/test/core/call/bm_client_call.cc
+++ b/test/core/call/bm_client_call.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/call/call_utils_test.cc b/test/core/call/call_utils_test.cc
index f9a8fdae345..323b3069394 100644
--- a/test/core/call/call_utils_test.cc
+++ b/test/core/call/call_utils_test.cc
@@ -14,12 +14,12 @@
 
 #include "src/core/lib/surface/call_utils.h"
 
+#include <grpc/grpc.h>
+
 #include <initializer_list>
 
 #include "gtest/gtest.h"
 
-#include <grpc/grpc.h>
-
 namespace grpc_core {
 
 TEST(CallUtils, AreWriteFlagsValid) {
diff --git a/test/core/call/client_call_test.cc b/test/core/call/client_call_test.cc
index ef9ba6cd1a4..78225dbea07 100644
--- a/test/core/call/client_call_test.cc
+++ b/test/core/call/client_call_test.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/lib/surface/client_call.h"
 
-#include "absl/status/status.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/util/debug_location.h"
diff --git a/test/core/call/request_buffer_test.cc b/test/core/call/request_buffer_test.cc
index 98aba0ac495..9e9f9a3fc6a 100644
--- a/test/core/call/request_buffer_test.cc
+++ b/test/core/call/request_buffer_test.cc
@@ -15,7 +15,6 @@
 #include "src/core/call/request_buffer.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/promise/poll_matcher.h"
 
 using testing::Mock;
diff --git a/test/core/call/server_call_test.cc b/test/core/call/server_call_test.cc
index b42f0503203..6e1db3b4d92 100644
--- a/test/core/call/server_call_test.cc
+++ b/test/core/call/server_call_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/surface/server_call.h"
 
-#include <atomic>
-
-#include "absl/status/status.h"
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 
+#include <atomic>
+
+#include "absl/status/status.h"
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/promise/promise.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/call/yodel/fuzzer_main.cc b/test/core/call/yodel/fuzzer_main.cc
index 0f14c28eb51..7e7f37224f0 100644
--- a/test/core/call/yodel/fuzzer_main.cc
+++ b/test/core/call/yodel/fuzzer_main.cc
@@ -12,14 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <stdio.h>
-
+#include <grpc/event_engine/event_engine.h>
 #include <gtest/gtest.h>
+#include <stdio.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/config.h"
diff --git a/test/core/call/yodel/test_main.cc b/test/core/call/yodel/test_main.cc
index 22b1ff3d561..5cdd9dead55 100644
--- a/test/core/call/yodel/test_main.cc
+++ b/test/core/call/yodel/test_main.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "absl/random/random.h"
-
 #include "src/core/lib/debug/trace.h"
 #include "test/core/call/yodel/yodel_test.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/call/yodel/yodel_test.cc b/test/core/call/yodel/yodel_test.cc
index ccd31f35fb9..f9969184867 100644
--- a/test/core/call/yodel/yodel_test.cc
+++ b/test/core/call/yodel/yodel_test.cc
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "absl/random/random.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/call/yodel/yodel_test.h b/test/core/call/yodel/yodel_test.h
index 7ccb97e7d6a..518e6f0e64f 100644
--- a/test/core/call/yodel/yodel_test.h
+++ b/test/core/call/yodel/yodel_test.h
@@ -15,14 +15,13 @@
 #ifndef GRPC_TEST_CORE_CALL_YODEL_YODEL_TEST_H
 #define GRPC_TEST_CORE_CALL_YODEL_YODEL_TEST_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include "absl/functional/any_invocable.h"
 #include "absl/log/log.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/promise/cancel_callback.h"
 #include "src/core/lib/promise/detail/promise_factory.h"
diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc
index 9e7ba84794d..fc07e704681 100644
--- a/test/core/channel/call_finalization_test.cc
+++ b/test/core/channel/call_finalization_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/channel/call_finalization.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc
index bb19b352e21..d79acdbc2e3 100644
--- a/test/core/channel/channel_args_test.cc
+++ b/test/core/channel/channel_args_test.cc
@@ -18,18 +18,16 @@
 
 #include "src/core/lib/channel/channel_args.h"
 
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/ref_counted.h"
diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc
index 82bda202df4..1c6ed8995f0 100644
--- a/test/core/channel/channel_stack_builder_test.cc
+++ b/test/core/channel/channel_stack_builder_test.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/lib/channel/channel_stack_builder.h"
 
+#include <grpc/grpc.h>
+
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc
index 1c722beb282..31d5e5fd216 100644
--- a/test/core/channel/channel_stack_test.cc
+++ b/test/core/channel/channel_stack_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/channel/channel_stack.h"
 
+#include <grpc/support/alloc.h>
+
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc
index d06f98fba2e..c207c274f80 100644
--- a/test/core/channel/minimal_stack_is_minimal_test.cc
+++ b/test/core/channel/minimal_stack_is_minimal_test.cc
@@ -29,6 +29,9 @@
 // configurations and assess whether such a change is correct and desirable.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -38,10 +41,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc
index 821087f9d93..c38b9dd737c 100644
--- a/test/core/channel/server_call_tracer_factory_test.cc
+++ b/test/core/channel/server_call_tracer_factory_test.cc
@@ -15,7 +15,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/test/core/channelz/channel_trace_test.cc b/test/core/channelz/channel_trace_test.cc
index e3fab992eb8..72834781eb5 100644
--- a/test/core/channelz/channel_trace_test.cc
+++ b/test/core/channelz/channel_trace_test.cc
@@ -18,6 +18,10 @@
 
 #include "src/core/channelz/channel_trace.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
 #include <stdlib.h>
 
 #include <list>
@@ -27,12 +31,6 @@
 #include "absl/synchronization/notification.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/channelz/channelz_registry_test.cc b/test/core/channelz/channelz_registry_test.cc
index 29110f3f5c1..3dbd7a80b9e 100644
--- a/test/core/channelz/channelz_registry_test.cc
+++ b/test/core/channelz/channelz_registry_test.cc
@@ -24,7 +24,6 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-
 #include "src/core/channelz/channelz.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/channelz/channelz_test.cc b/test/core/channelz/channelz_test.cc
index a43950eefbb..ce58754cb74 100644
--- a/test/core/channelz/channelz_test.cc
+++ b/test/core/channelz/channelz_test.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/channelz/channelz.h"
 
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/time.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -29,16 +37,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/time.h>
-
 #include "src/core/channelz/channelz_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/client_channel/bm_client_channel.cc b/test/core/client_channel/bm_client_channel.cc
index 1ee51257c9f..566da748da9 100644
--- a/test/core/client_channel/bm_client_channel.cc
+++ b/test/core/client_channel/bm_client_channel.cc
@@ -13,12 +13,10 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "test/core/transport/call_spine_benchmarks.h"
diff --git a/test/core/client_channel/bm_load_balanced_call_destination.cc b/test/core/client_channel/bm_load_balanced_call_destination.cc
index f3a52f40ae9..555e51bdcc5 100644
--- a/test/core/client_channel/bm_load_balanced_call_destination.cc
+++ b/test/core/client_channel/bm_load_balanced_call_destination.cc
@@ -13,12 +13,10 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/load_balanced_call_destination.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "test/core/transport/call_spine_benchmarks.h"
diff --git a/test/core/client_channel/client_channel_service_config_test.cc b/test/core/client_channel/client_channel_service_config_test.cc
index 28ffddf7f31..67b6af99e43 100644
--- a/test/core/client_channel/client_channel_service_config_test.cc
+++ b/test/core/client_channel/client_channel_service_config_test.cc
@@ -16,13 +16,12 @@
 
 #include "src/core/client_channel/client_channel_service_config.h"
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config.h"
diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc
index 2c624c3b9c9..4dc980f5855 100644
--- a/test/core/client_channel/client_channel_test.cc
+++ b/test/core/client_channel/client_channel_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/client_channel/client_channel.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/client_channel/connected_subchannel_test.cc b/test/core/client_channel/connected_subchannel_test.cc
index 98f5b26207f..619577d719e 100644
--- a/test/core/client_channel/connected_subchannel_test.cc
+++ b/test/core/client_channel/connected_subchannel_test.cc
@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel.h"
 #include "src/core/client_channel/local_subchannel_pool.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/core/client_channel/lb_metadata_test.cc b/test/core/client_channel/lb_metadata_test.cc
index 0ad10a62971..3d88972714c 100644
--- a/test/core/client_channel/lb_metadata_test.cc
+++ b/test/core/client_channel/lb_metadata_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/client_channel/load_balanced_call_destination_test.cc b/test/core/client_channel/load_balanced_call_destination_test.cc
index 399f7bddc5a..268ea7825d4 100644
--- a/test/core/client_channel/load_balanced_call_destination_test.cc
+++ b/test/core/client_channel/load_balanced_call_destination_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/client_channel/load_balanced_call_destination.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 #include <queue>
@@ -21,9 +23,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "test/core/call/yodel/yodel_test.h"
 
 using testing::StrictMock;
diff --git a/test/core/client_channel/retry_service_config_test.cc b/test/core/client_channel/retry_service_config_test.cc
index 5578e18ed11..b44bf119ec9 100644
--- a/test/core/client_channel/retry_service_config_test.cc
+++ b/test/core/client_channel/retry_service_config_test.cc
@@ -16,15 +16,14 @@
 
 #include "src/core/client_channel/retry_service_config.h"
 
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config.h"
diff --git a/test/core/client_channel/retry_throttle_test.cc b/test/core/client_channel/retry_throttle_test.cc
index 78cda1694ad..f8463ba83d4 100644
--- a/test/core/client_channel/retry_throttle_test.cc
+++ b/test/core/client_channel/retry_throttle_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/client_channel/retry_throttle.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/client_channel/subchannel_args_test.cc b/test/core/client_channel/subchannel_args_test.cc
index 3750a8dc42b..b7f3aa3287b 100644
--- a/test/core/client_channel/subchannel_args_test.cc
+++ b/test/core/client_channel/subchannel_args_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/subchannel.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc
index 49d723884ca..81aa23d06cf 100644
--- a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc
+++ b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
 
-#include <grpc/support/port_platform.h>
-
 // Make a template argument to test which bit pattern remains in A's destructor
 // to try and detect similar bugs in non-MSAN builds (none have been detected
 // yet thankfully)
diff --git a/test/core/compression/compression_test.cc b/test/core/compression/compression_test.cc
index 9ed5b61b042..09a84548dd6 100644
--- a/test/core/compression/compression_test.cc
+++ b/test/core/compression/compression_test.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/compression.h>
+#include <grpc/slice.h>
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -23,10 +25,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/slice.h>
-
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/compression/message_compress_fuzzer.cc b/test/core/compression/message_compress_fuzzer.cc
index 64abbf21a4f..8b98844d910 100644
--- a/test/core/compression/message_compress_fuzzer.cc
+++ b/test/core/compression/message_compress_fuzzer.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/lib/compression/message_compress.h"
 
diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc
index e8aac4237a6..7bf558af1fa 100644
--- a/test/core/compression/message_compress_test.cc
+++ b/test/core/compression/message_compress_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/compression/message_compress.h"
 
+#include <grpc/compression.h>
+#include <grpc/slice_buffer.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,10 +28,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/slice_buffer.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/useful.h"
 #include "test/core/test_util/slice_splitter.h"
diff --git a/test/core/compression/message_decompress_fuzzer.cc b/test/core/compression/message_decompress_fuzzer.cc
index 4996705182b..58b324de716 100644
--- a/test/core/compression/message_decompress_fuzzer.cc
+++ b/test/core/compression/message_decompress_fuzzer.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/lib/compression/message_compress.h"
 
diff --git a/test/core/config/core_configuration_test.cc b/test/core/config/core_configuration_test.cc
index bf2e10b1890..3a391a8f097 100644
--- a/test/core/config/core_configuration_test.cc
+++ b/test/core/config/core_configuration_test.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/lib/config/core_configuration.h"
 
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <functional>
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 namespace grpc_core {
 
 // Allow substitution of config builder - in real code this would iterate
diff --git a/test/core/config/load_config_test.cc b/test/core/config/load_config_test.cc
index 7d9ac207163..8c34bb0b651 100644
--- a/test/core/config/load_config_test.cc
+++ b/test/core/config/load_config_test.cc
@@ -16,7 +16,6 @@
 
 #include "absl/flags/flag.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/env.h"
 
 ABSL_FLAG(std::vector<std::string>, comma_separated_strings, {}, "");
diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc
index f76151aa9d3..1badbcb5391 100644
--- a/test/core/end2end/bad_server_response_test.cc
+++ b/test/core/end2end/bad_server_response_test.cc
@@ -16,17 +16,6 @@
 //
 //
 
-#include <inttypes.h>
-#include <limits.h>
-#include <string.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -38,7 +27,16 @@
 #include <grpc/support/atm.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <string.h>
+
+#include <memory>
+#include <string>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/event_engine/shim.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc
index 436b2fb5730..e87fbcf3c64 100644
--- a/test/core/end2end/connection_refused_test.cc
+++ b/test/core/end2end/connection_refused_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <string.h>
-
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -31,7 +24,12 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <string.h>
+
+#include <string>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc
index d1a322bc989..2b606807b41 100644
--- a/test/core/end2end/cq_verifier.cc
+++ b/test/core/end2end/cq_verifier.cc
@@ -18,6 +18,12 @@
 
 #include "test/core/end2end/cq_verifier.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
@@ -36,14 +42,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/compression/message_compress.h"
 #include "src/core/lib/surface/event_string.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h
index d86d3248958..856822807fa 100644
--- a/test/core/end2end/cq_verifier.h
+++ b/test/core/end2end/cq_verifier.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_TEST_CORE_END2END_CQ_VERIFIER_H
 #define GRPC_TEST_CORE_END2END_CQ_VERIFIER_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include <functional>
@@ -28,12 +32,6 @@
 #include "absl/container/flat_hash_map.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/types/variant.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/debug_location.h"
 #include "src/core/util/time.h"
 
diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc
index 44fc736e5ca..cbe48b86785 100644
--- a/test/core/end2end/dualstack_socket_test.cc
+++ b/test/core/end2end/dualstack_socket_test.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -23,18 +28,16 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_EV
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <vector>
@@ -43,12 +46,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/resolve_address.h"
diff --git a/test/core/end2end/end2end_test_fuzzer.cc b/test/core/end2end/end2end_test_fuzzer.cc
index e74627117a2..331ad4b998b 100644
--- a/test/core/end2end/end2end_test_fuzzer.cc
+++ b/test/core/end2end/end2end_test_fuzzer.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/end2end/end2end_test_fuzzer.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 
 #include <algorithm>
@@ -24,12 +26,7 @@
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/config.h"
diff --git a/test/core/end2end/end2end_test_main.cc b/test/core/end2end/end2end_test_main.cc
index 8d40eb90900..c9b0d0f0050 100644
--- a/test/core/end2end/end2end_test_main.cc
+++ b/test/core/end2end/end2end_test_main.cc
@@ -19,7 +19,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/config_vars.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/fixtures/h2_tls_common.h"
diff --git a/test/core/end2end/end2end_test_suites.cc b/test/core/end2end/end2end_test_suites.cc
index 4b74ff032be..4b111ad1586 100644
--- a/test/core/end2end/end2end_test_suites.cc
+++ b/test/core/end2end/end2end_test_suites.cc
@@ -12,6 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/compression.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_posix.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -33,18 +43,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_posix.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h
index 9dc89e93a87..b358e9456e6 100644
--- a/test/core/end2end/end2end_tests.h
+++ b/test/core/end2end/end2end_tests.h
@@ -15,6 +15,16 @@
 #ifndef GRPC_TEST_CORE_END2END_END2END_TESTS_H
 #define GRPC_TEST_CORE_END2END_END2END_TESTS_H
 
+#include <grpc/byte_buffer.h>
+#include <grpc/compression.h>
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -36,18 +46,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/compression.h>
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/test/core/end2end/fixtures/h2_oauth2_common.h b/test/core/end2end/fixtures/h2_oauth2_common.h
index 92d873d313c..fe52b1c8656 100644
--- a/test/core/end2end/fixtures/h2_oauth2_common.h
+++ b/test/core/end2end/fixtures/h2_oauth2_common.h
@@ -15,10 +15,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_OAUTH2_COMMON_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_OAUTH2_COMMON_H
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -26,7 +22,9 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
index cbe17d19a13..cf8a611f40b 100644
--- a/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
+++ b/test/core/end2end/fixtures/h2_ssl_cred_reload_fixture.h
@@ -15,10 +15,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_CRED_RELOAD_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_CRED_RELOAD_FIXTURE_H
 
-#include <stddef.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -26,7 +22,9 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <stddef.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
diff --git a/test/core/end2end/fixtures/h2_ssl_tls_common.h b/test/core/end2end/fixtures/h2_ssl_tls_common.h
index ce346b3175e..d97ca4ad9f5 100644
--- a/test/core/end2end/fixtures/h2_ssl_tls_common.h
+++ b/test/core/end2end/fixtures/h2_ssl_tls_common.h
@@ -15,10 +15,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_TLS_COMMON_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_SSL_TLS_COMMON_H
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -26,7 +22,9 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
diff --git a/test/core/end2end/fixtures/h2_tls_common.h b/test/core/end2end/fixtures/h2_tls_common.h
index c7a5ffd1d73..1c325dc7e8c 100644
--- a/test/core/end2end/fixtures/h2_tls_common.h
+++ b/test/core/end2end/fixtures/h2_tls_common.h
@@ -19,14 +19,6 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_H2_TLS_COMMON_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_H2_TLS_COMMON_H
 
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,7 +26,13 @@
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/strings/string_view.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc
index 88b65d3de94..c5f77bcf27f 100644
--- a/test/core/end2end/fixtures/http_proxy_fixture.cc
+++ b/test/core/end2end/fixtures/http_proxy_fixture.cc
@@ -18,6 +18,11 @@
 
 #include "test/core/end2end/fixtures/http_proxy_fixture.h"
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <limits.h>
 #include <string.h>
 
@@ -33,13 +38,6 @@
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/test/core/end2end/fixtures/inproc_fixture.h b/test/core/end2end/fixtures/inproc_fixture.h
index 4f08c3773fd..7a70aa138a7 100644
--- a/test/core/end2end/fixtures/inproc_fixture.h
+++ b/test/core/end2end/fixtures/inproc_fixture.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_INPROC_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_INPROC_FIXTURE_H
 
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/functional/any_invocable.h"
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/fixtures/local_util.cc b/test/core/end2end/fixtures/local_util.cc
index 63bc96b9052..c9ae9c5f1ce 100644
--- a/test/core/end2end/fixtures/local_util.cc
+++ b/test/core/end2end/fixtures/local_util.cc
@@ -18,16 +18,15 @@
 
 #include "test/core/end2end/fixtures/local_util.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
 
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-
 static void process_auth_failure(void* state, grpc_auth_context* /*ctx*/,
                                  const grpc_metadata* /*md*/,
                                  size_t /*md_count*/,
diff --git a/test/core/end2end/fixtures/local_util.h b/test/core/end2end/fixtures/local_util.h
index fc9f8d8af5c..e7f3ce3c2d2 100644
--- a/test/core/end2end/fixtures/local_util.h
+++ b/test/core/end2end/fixtures/local_util.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_LOCAL_UTIL_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_LOCAL_UTIL_H
 
-#include <string>
-
-#include "absl/functional/any_invocable.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
 
+#include <string>
+
+#include "absl/functional/any_invocable.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc
index 1d78ebcd2b7..728eddfc70d 100644
--- a/test/core/end2end/fixtures/proxy.cc
+++ b/test/core/end2end/fixtures/proxy.cc
@@ -18,15 +18,6 @@
 
 #include "test/core/end2end/fixtures/proxy.h"
 
-#include <string.h>
-
-#include <cstddef>
-#include <string>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/propagation_bits.h>
@@ -35,7 +26,14 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <string.h>
+
+#include <cstddef>
+#include <string>
+#include <utility>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/call.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/end2end/fixtures/secure_fixture.h b/test/core/end2end/fixtures/secure_fixture.h
index 4586994981b..20e488f427b 100644
--- a/test/core/end2end/fixtures/secure_fixture.h
+++ b/test/core/end2end/fixtures/secure_fixture.h
@@ -15,16 +15,15 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_SECURE_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_SECURE_FIXTURE_H
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/host_port.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/fixtures/sockpair_fixture.h b/test/core/end2end/fixtures/sockpair_fixture.h
index cedc002695f..ce3616c22cf 100644
--- a/test/core/end2end/fixtures/sockpair_fixture.h
+++ b/test/core/end2end/fixtures/sockpair_fixture.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_TEST_CORE_END2END_FIXTURES_SOCKPAIR_FIXTURE_H
 #define GRPC_TEST_CORE_END2END_FIXTURES_SOCKPAIR_FIXTURE_H
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
@@ -22,11 +26,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc
index c4e960a7d9a..2cc58bdf76b 100644
--- a/test/core/end2end/fuzzers/api_fuzzer.cc
+++ b/test/core/end2end/fuzzers/api_fuzzer.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <string.h>
 
 #include <algorithm>
@@ -36,14 +42,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc
index 9278eb8d0e5..b44a42e8fa6 100644
--- a/test/core/end2end/fuzzers/client_fuzzer.cc
+++ b/test/core/end2end/fuzzers/client_fuzzer.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+
 #include <string>
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_args_preconditioning.h"
diff --git a/test/core/end2end/fuzzers/connector_fuzzer.h b/test/core/end2end/fuzzers/connector_fuzzer.h
index 64b78aeb0bf..458851fa7cd 100644
--- a/test/core/end2end/fuzzers/connector_fuzzer.h
+++ b/test/core/end2end/fuzzers/connector_fuzzer.h
@@ -16,7 +16,6 @@
 #define GRPC_TEST_CORE_END2END_FUZZERS_CONNECTOR_FUZZER_H
 
 #include "absl/functional/function_ref.h"
-
 #include "src/core/client_channel/connector.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
diff --git a/test/core/end2end/fuzzers/fuzzing_common.cc b/test/core/end2end/fuzzers/fuzzing_common.cc
index 820af4ab182..85d6ec51d26 100644
--- a/test/core/end2end/fuzzers/fuzzing_common.cc
+++ b/test/core/end2end/fuzzers/fuzzing_common.cc
@@ -18,6 +18,13 @@
 
 #include "test/core/end2end/fuzzers/fuzzing_common.h"
 
+#include <grpc/byte_buffer.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <memory>
@@ -27,15 +34,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/end2end/fuzzers/fuzzing_common.h b/test/core/end2end/fuzzers/fuzzing_common.h
index b365c698e2d..5f287fae66b 100644
--- a/test/core/end2end/fuzzers/fuzzing_common.h
+++ b/test/core/end2end/fuzzers/fuzzing_common.h
@@ -19,6 +19,7 @@
 #ifndef GRPC_TEST_CORE_END2END_FUZZERS_FUZZING_COMMON_H
 #define GRPC_TEST_CORE_END2END_FUZZERS_FUZZING_COMMON_H
 
+#include <grpc/grpc.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -30,9 +31,6 @@
 
 #include "absl/log/check.h"
 #include "absl/types/span.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/fuzzers/network_input.cc b/test/core/end2end/fuzzers/network_input.cc
index 0afd8d1b95d..6a91a74d9ca 100644
--- a/test/core/end2end/fuzzers/network_input.cc
+++ b/test/core/end2end/fuzzers/network_input.cc
@@ -14,6 +14,7 @@
 
 #include "test/core/end2end/fuzzers/network_input.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -26,9 +27,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/frame.h"
 #include "src/core/ext/transport/chttp2/transport/varint.h"
diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc
index ebf7034caec..1983ff9316e 100644
--- a/test/core/end2end/fuzzers/server_fuzzer.cc
+++ b/test/core/end2end/fuzzers/server_fuzzer.cc
@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/end2end/fuzzers/server_fuzzer.h b/test/core/end2end/fuzzers/server_fuzzer.h
index c8e42730348..621bb70ac4f 100644
--- a/test/core/end2end/fuzzers/server_fuzzer.h
+++ b/test/core/end2end/fuzzers/server_fuzzer.h
@@ -15,10 +15,9 @@
 #ifndef GRPC_TEST_CORE_END2END_FUZZERS_SERVER_FUZZER_H
 #define GRPC_TEST_CORE_END2END_FUZZERS_SERVER_FUZZER_H
 
-#include "absl/functional/function_ref.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/functional/function_ref.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/fuzzers/fuzzer_input.pb.h"
 
diff --git a/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc b/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc
index 6d688e655a2..09070be455f 100644
--- a/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc
+++ b/test/core/end2end/fuzzers/server_fuzzer_chaotic_good.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc_security.h>
 
+#include "absl/log/check.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/libfuzzer/libfuzzer_macro.h"
diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc
index 2ebc094e210..ef2e6840c2d 100644
--- a/test/core/end2end/goaway_server_test.cc
+++ b/test/core/end2end/goaway_server_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -32,18 +42,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/credentials.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/test/core/end2end/h2_ssl_cert_test.cc b/test/core/end2end/h2_ssl_cert_test.cc
index d9509266d0f..716b1faa0ad 100644
--- a/test/core/end2end/h2_ssl_cert_test.cc
+++ b/test/core/end2end/h2_ssl_cert_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -28,18 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc
index 882f09995e8..7bb518425b4 100644
--- a/test/core/end2end/h2_ssl_session_reuse_test.cc
+++ b/test/core/end2end/h2_ssl_session_reuse_test.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <string.h>
-
-#include <string>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,7 +25,13 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc
index a9f74bed935..9d232edf911 100644
--- a/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc
+++ b/test/core/end2end/h2_tls_peer_property_external_verifier_test.cc
@@ -15,16 +15,6 @@
 // limitations under the License.
 //
 //
-#include <stdint.h>
-#include <string.h>
-
-#include <string>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -34,7 +24,14 @@
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
+#include <stdint.h>
+#include <string.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/types/optional.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc
index ee7caff77ca..d587079a0e2 100644
--- a/test/core/end2end/invalid_call_argument_test.cc
+++ b/test/core/end2end/invalid_call_argument_test.cc
@@ -16,16 +16,6 @@
 //
 //
 
-#include <limits.h>
-#include <string.h>
-
-#include <initializer_list>
-#include <memory>
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -35,7 +25,15 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <limits.h>
+#include <string.h>
 
+#include <initializer_list>
+#include <memory>
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/host_port.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc
index 5e8d9add4fd..f03b3225d70 100644
--- a/test/core/end2end/no_server_test.cc
+++ b/test/core/end2end/no_server_test.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <utility>
@@ -25,15 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/time/time.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc
index 1a556d5ee52..adc5d8529f5 100644
--- a/test/core/end2end/tests/bad_ping.cc
+++ b/test/core/end2end/tests/bad_ping.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc
index a96ce818304..8b08e161521 100644
--- a/test/core/end2end/tests/binary_metadata.cc
+++ b/test/core/end2end/tests/binary_metadata.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc
index b19d555005b..115d368c473 100644
--- a/test/core/end2end/tests/call_creds.cc
+++ b/test/core/end2end/tests/call_creds.cc
@@ -16,17 +16,16 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/log.h"
-#include "absl/types/optional.h"
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc
index ee847552969..7c90de9486a 100644
--- a/test/core/end2end/tests/call_host_override.cc
+++ b/test/core/end2end/tests/call_host_override.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc
index e22063354de..fde403d5b5a 100644
--- a/test/core/end2end/tests/cancel_after_accept.cc
+++ b/test/core/end2end/tests/cancel_after_accept.cc
@@ -16,15 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_after_client_done.cc b/test/core/end2end/tests/cancel_after_client_done.cc
index 8ca9e005ba8..a25bde486b4 100644
--- a/test/core/end2end/tests/cancel_after_client_done.cc
+++ b/test/core/end2end/tests/cancel_after_client_done.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/end2end/tests/cancel_test_helpers.h"
diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc
index aeaf45bd2f1..6c66eae9f4d 100644
--- a/test/core/end2end/tests/cancel_after_invoke.cc
+++ b/test/core/end2end/tests/cancel_after_invoke.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc
index 00f268683a4..f225f1ad80d 100644
--- a/test/core/end2end/tests/cancel_after_round_trip.cc
+++ b/test/core/end2end/tests/cancel_after_round_trip.cc
@@ -16,15 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/cancel_before_invoke.cc b/test/core/end2end/tests/cancel_before_invoke.cc
index 6c5e07d6d63..942acef1941 100644
--- a/test/core/end2end/tests/cancel_before_invoke.cc
+++ b/test/core/end2end/tests/cancel_before_invoke.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "test/core/end2end/end2end_tests.h"
 
 namespace grpc_core {
diff --git a/test/core/end2end/tests/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc
index 4673ade3698..f80779ad96f 100644
--- a/test/core/end2end/tests/cancel_with_status.cc
+++ b/test/core/end2end/tests/cancel_with_status.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc
index dcd363a1051..7332b428a22 100644
--- a/test/core/end2end/tests/channelz.cc
+++ b/test/core/end2end/tests/channelz.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/channelz/channelz.h"
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/server/server.h"
diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc
index 2cf6a617556..372e3d377b6 100644
--- a/test/core/end2end/tests/client_streaming.cc
+++ b/test/core/end2end/tests/client_streaming.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc
index cbae272da8e..0df335bca87 100644
--- a/test/core/end2end/tests/compressed_payload.cc
+++ b/test/core/end2end/tests/compressed_payload.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/compression.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <initializer_list>
@@ -24,12 +28,6 @@
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/bitset.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc
index 00e83236e4d..364489fdb05 100644
--- a/test/core/end2end/tests/connectivity.cc
+++ b/test/core/end2end/tests/connectivity.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc
index fe5100dd845..5a84e9acdcd 100644
--- a/test/core/end2end/tests/default_host.cc
+++ b/test/core/end2end/tests/default_host.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/disappearing_server.cc b/test/core/end2end/tests/disappearing_server.cc
index a42853b538b..31badc9f9b7 100644
--- a/test/core/end2end/tests/disappearing_server.cc
+++ b/test/core/end2end/tests/disappearing_server.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc
index feae6776991..e1836375f1c 100644
--- a/test/core/end2end/tests/filter_causes_close.cc
+++ b/test/core/end2end/tests/filter_causes_close.cc
@@ -16,6 +16,7 @@
 //
 //
 
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <memory>
@@ -23,9 +24,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc
index 5183489db1e..c258ee74221 100644
--- a/test/core/end2end/tests/filter_init_fails.cc
+++ b/test/core/end2end/tests/filter_init_fails.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 #include <utility>
 
@@ -23,9 +25,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc
index 5f14a22a85b..ac3da1a9370 100644
--- a/test/core/end2end/tests/filtered_metadata.cc
+++ b/test/core/end2end/tests/filtered_metadata.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/graceful_server_shutdown.cc b/test/core/end2end/tests/graceful_server_shutdown.cc
index 34390d02f07..8e72b926272 100644
--- a/test/core/end2end/tests/graceful_server_shutdown.cc
+++ b/test/core/end2end/tests/graceful_server_shutdown.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc
index 48553dd0357..7763d831da7 100644
--- a/test/core/end2end/tests/grpc_authz.cc
+++ b/test/core/end2end/tests/grpc_authz.cc
@@ -12,17 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/authorization/authorization_policy_provider.h"
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc
index e9dd5cd39a7..5708bda98db 100644
--- a/test/core/end2end/tests/high_initial_seqno.cc
+++ b/test/core/end2end/tests/high_initial_seqno.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc
index 766a00cbe99..f42894e18b7 100644
--- a/test/core/end2end/tests/hpack_size.cc
+++ b/test/core/end2end/tests/hpack_size.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stdio.h>
 
 #include <utility>
@@ -24,10 +26,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/no_destruct.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc
index 51561dbbe17..9e33da9ad5d 100644
--- a/test/core/end2end/tests/http2_stats.cc
+++ b/test/core/end2end/tests/http2_stats.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/status.h>
+#include <grpc/support/time.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -23,10 +26,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc
index 3302ee48e89..2b3ba1ba511 100644
--- a/test/core/end2end/tests/invoke_large_request.cc
+++ b/test/core/end2end/tests/invoke_large_request.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc
index 9c94b653c84..e60f8b29c97 100644
--- a/test/core/end2end/tests/keepalive_timeout.cc
+++ b/test/core/end2end/tests/keepalive_timeout.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc
index 9f053983980..b22b75d29d9 100644
--- a/test/core/end2end/tests/large_metadata.cc
+++ b/test/core/end2end/tests/large_metadata.cc
@@ -16,16 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stdio.h>
 
 #include <string>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc
index 1b0d301b724..9c644dbe69c 100644
--- a/test/core/end2end/tests/max_concurrent_streams.cc
+++ b/test/core/end2end/tests/max_concurrent_streams.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc
index 0938eb2393c..88a0b2b3915 100644
--- a/test/core/end2end/tests/max_connection_age.cc
+++ b/test/core/end2end/tests/max_connection_age.cc
@@ -16,16 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <limits.h>
 
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc
index 1dfbd2f6ede..1d139e862ac 100644
--- a/test/core/end2end/tests/max_connection_idle.cc
+++ b/test/core/end2end/tests/max_connection_idle.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc
index 5a70f2cdfa9..a7154fcb2d2 100644
--- a/test/core/end2end/tests/max_message_length.cc
+++ b/test/core/end2end/tests/max_message_length.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/negative_deadline.cc b/test/core/end2end/tests/negative_deadline.cc
index c1c5392c1bf..1fdf6771325 100644
--- a/test/core/end2end/tests/negative_deadline.cc
+++ b/test/core/end2end/tests/negative_deadline.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc
index e144dda3d1d..0bae8cf6270 100644
--- a/test/core/end2end/tests/no_logging.cc
+++ b/test/core/end2end/tests/no_logging.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+
 #include <atomic>
 #include <map>
 #include <regex>
@@ -32,10 +35,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc
index 31c5456dee4..edc97835ba8 100644
--- a/test/core/end2end/tests/payload.cc
+++ b/test/core/end2end/tests/payload.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/ping.cc b/test/core/end2end/tests/ping.cc
index 70b2fbb57c2..73094b8feb2 100644
--- a/test/core/end2end/tests/ping.cc
+++ b/test/core/end2end/tests/ping.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/ping_pong_streaming.cc b/test/core/end2end/tests/ping_pong_streaming.cc
index 9cfd8bb92a9..784db17c7ad 100644
--- a/test/core/end2end/tests/ping_pong_streaming.cc
+++ b/test/core/end2end/tests/ping_pong_streaming.cc
@@ -16,10 +16,10 @@
 //
 //
 
-#include <memory>
-
 #include <grpc/status.h>
 
+#include <memory>
+
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc
index 9b2b3897b83..23bcdbaff5e 100644
--- a/test/core/end2end/tests/proxy_auth.cc
+++ b/test/core/end2end/tests/proxy_auth.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/registered_call.cc b/test/core/end2end/tests/registered_call.cc
index 1dc13b5acd5..e5779d67103 100644
--- a/test/core/end2end/tests/registered_call.cc
+++ b/test/core/end2end/tests/registered_call.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "gtest/gtest.h"
-
 #include <grpc/status.h>
 
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc
index 60db5aae583..12d25f13f05 100644
--- a/test/core/end2end/tests/request_with_flags.cc
+++ b/test/core/end2end/tests/request_with_flags.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -24,12 +28,6 @@
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/transport/transport.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/cq_verifier.h"
diff --git a/test/core/end2end/tests/request_with_payload.cc b/test/core/end2end/tests/request_with_payload.cc
index d2da70e6ec6..76cdf6c95e8 100644
--- a/test/core/end2end/tests/request_with_payload.cc
+++ b/test/core/end2end/tests/request_with_payload.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc
index 4b25143b5ec..637eee793c7 100644
--- a/test/core/end2end/tests/resource_quota_server.cc
+++ b/test/core/end2end/tests/resource_quota_server.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -24,11 +27,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc
index 22e3434e553..e2a9361336a 100644
--- a/test/core/end2end/tests/retry.cc
+++ b/test/core/end2end/tests/retry.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc
index cf33d718760..abef13e894c 100644
--- a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc
+++ b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc
@@ -14,12 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/retry_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc
index 255d31ffe87..f30324170f5 100644
--- a/test/core/end2end/tests/retry_cancel_during_delay.cc
+++ b/test/core/end2end/tests/retry_cancel_during_delay.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
index 0fa65238d88..026bfc18278 100644
--- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
+++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
@@ -23,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc
index fd26c53c513..be20108ba49 100644
--- a/test/core/end2end/tests/retry_cancellation.cc
+++ b/test/core/end2end/tests/retry_cancellation.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc
index be335e8cd6d..9d86e113f5b 100644
--- a/test/core/end2end/tests/retry_disabled.cc
+++ b/test/core/end2end/tests/retry_disabled.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
index 0171d6a828d..c819437c2b4 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
index 90ac8edd5a0..7a6340c790e 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
index f962de41719..0edc8a9cfda 100644
--- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
+++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc
index abe92f8f9ac..f09cb785251 100644
--- a/test/core/end2end/tests/retry_lb_drop.cc
+++ b/test/core/end2end/tests/retry_lb_drop.cc
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <algorithm>
 #include <memory>
 #include <utility>
@@ -24,11 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc
index 77ef319f3e3..7eed6fe21b3 100644
--- a/test/core/end2end/tests/retry_lb_fail.cc
+++ b/test/core/end2end/tests/retry_lb_fail.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <atomic>
 #include <memory>
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/retry_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc
index 4051f38daa6..b0ce4bc5c10 100644
--- a/test/core/end2end/tests/retry_non_retriable_status.cc
+++ b/test/core/end2end/tests/retry_non_retriable_status.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
index 07340b8d7f9..dfb33ba1ec3 100644
--- a/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
+++ b/test/core/end2end/tests/retry_non_retriable_status_before_trailers.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
index d21ce8ae7c3..f114ad330fd 100644
--- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
+++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
index f0447521b8c..0bb835fbca8 100644
--- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
+++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc
index 2c4d44e6e1a..24021d4dbfa 100644
--- a/test/core/end2end/tests/retry_recv_initial_metadata.cc
+++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_recv_message.cc b/test/core/end2end/tests/retry_recv_message.cc
index a2fcbc5ebd0..93d282684e9 100644
--- a/test/core/end2end/tests/retry_recv_message.cc
+++ b/test/core/end2end/tests/retry_recv_message.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc
index 1260785976a..31f11c01567 100644
--- a/test/core/end2end/tests/retry_recv_message_replay.cc
+++ b/test/core/end2end/tests/retry_recv_message_replay.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
index ab8a0fe4e34..9f986707f50 100644
--- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
+++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc
@@ -14,16 +14,15 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
index 2f99da1ed2f..2f8bc7ea21a 100644
--- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
+++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc
@@ -16,15 +16,14 @@
 //
 //
 
-#include <string>
-
-#include "absl/types/optional.h"
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 
+#include <string>
+
+#include "absl/types/optional.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc
index 46ac40cff79..96cc4b0197a 100644
--- a/test/core/end2end/tests/retry_send_op_fails.cc
+++ b/test/core/end2end/tests/retry_send_op_fails.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
diff --git a/test/core/end2end/tests/retry_send_recv_batch.cc b/test/core/end2end/tests/retry_send_recv_batch.cc
index 5f9ac9c7aa4..0708bd6665d 100644
--- a/test/core/end2end/tests/retry_send_recv_batch.cc
+++ b/test/core/end2end/tests/retry_send_recv_batch.cc
@@ -14,13 +14,12 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc
index 58507c833c3..b1acf7c3802 100644
--- a/test/core/end2end/tests/retry_server_pushback_delay.cc
+++ b/test/core/end2end/tests/retry_server_pushback_delay.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc
index 33226294b89..e63f92a3b3c 100644
--- a/test/core/end2end/tests/retry_server_pushback_disabled.cc
+++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc
index 57b081803ac..62efed732ee 100644
--- a/test/core/end2end/tests/retry_streaming.cc
+++ b/test/core/end2end/tests/retry_streaming.cc
@@ -16,15 +16,14 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/surface/channel.h"
diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc
index 2e642d4852f..c882b77d708 100644
--- a/test/core/end2end/tests/retry_streaming_after_commit.cc
+++ b/test/core/end2end/tests/retry_streaming_after_commit.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
index 1d2e1f54d81..52cfc2b3659 100644
--- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
+++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_throttled.cc b/test/core/end2end/tests/retry_throttled.cc
index a0ca05f8757..0f973c59a66 100644
--- a/test/core/end2end/tests/retry_throttled.cc
+++ b/test/core/end2end/tests/retry_throttled.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc
index b68b5c14853..6cbbe9529ef 100644
--- a/test/core/end2end/tests/retry_too_many_attempts.cc
+++ b/test/core/end2end/tests/retry_too_many_attempts.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc
index 40352a5148f..e26882ca11e 100644
--- a/test/core/end2end/tests/retry_transparent_goaway.cc
+++ b/test/core/end2end/tests/retry_transparent_goaway.cc
@@ -14,16 +14,15 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 #include <new>
 
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
index 75e4c8a9264..fd8eadff762 100644
--- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
+++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include "absl/types/optional.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "absl/types/optional.h"
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
index 1a7ca65aae6..9b3366397f1 100644
--- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
+++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <memory>
@@ -22,10 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/end2end/tests/retry_unref_before_finish.cc b/test/core/end2end/tests/retry_unref_before_finish.cc
index 5c6a460c23d..c38fcb99c12 100644
--- a/test/core/end2end/tests/retry_unref_before_finish.cc
+++ b/test/core/end2end/tests/retry_unref_before_finish.cc
@@ -14,13 +14,12 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/retry_unref_before_recv.cc b/test/core/end2end/tests/retry_unref_before_recv.cc
index 569e8114d6b..83766e89bfa 100644
--- a/test/core/end2end/tests/retry_unref_before_recv.cc
+++ b/test/core/end2end/tests/retry_unref_before_recv.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/server_finishes_request.cc b/test/core/end2end/tests/server_finishes_request.cc
index b1df0a39904..ff03a272f7d 100644
--- a/test/core/end2end/tests/server_finishes_request.cc
+++ b/test/core/end2end/tests/server_finishes_request.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc
index fd4e34d9afc..0d64489aa44 100644
--- a/test/core/end2end/tests/server_streaming.cc
+++ b/test/core/end2end/tests/server_streaming.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/cq_verifier.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/shutdown_finishes_calls.cc b/test/core/end2end/tests/shutdown_finishes_calls.cc
index 03e83c57c62..39dc5ceb0c0 100644
--- a/test/core/end2end/tests/shutdown_finishes_calls.cc
+++ b/test/core/end2end/tests/shutdown_finishes_calls.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/status.h>
 #include <grpc/support/time.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/end2end/tests/simple_delayed_request.cc b/test/core/end2end/tests/simple_delayed_request.cc
index e9c61145e2b..952f983f2e8 100644
--- a/test/core/end2end/tests/simple_delayed_request.cc
+++ b/test/core/end2end/tests/simple_delayed_request.cc
@@ -16,15 +16,14 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
diff --git a/test/core/end2end/tests/simple_metadata.cc b/test/core/end2end/tests/simple_metadata.cc
index 4d1df2c05ff..265a71a5b74 100644
--- a/test/core/end2end/tests/simple_metadata.cc
+++ b/test/core/end2end/tests/simple_metadata.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc
index 5236e9692da..15a62333d64 100644
--- a/test/core/end2end/tests/simple_request.cc
+++ b/test/core/end2end/tests/simple_request.cc
@@ -16,6 +16,7 @@
 //
 //
 
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -27,9 +28,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc
index 3ac939ed861..5efecd10671 100644
--- a/test/core/end2end/tests/streaming_error_response.cc
+++ b/test/core/end2end/tests/streaming_error_response.cc
@@ -19,12 +19,11 @@
 /// \file Verify that status ordering rules are obeyed.
 /// \ref doc/status_ordering.md
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/timeout_before_request_call.cc b/test/core/end2end/tests/timeout_before_request_call.cc
index 3a7217ed49d..e6b1c59f295 100644
--- a/test/core/end2end/tests/timeout_before_request_call.cc
+++ b/test/core/end2end/tests/timeout_before_request_call.cc
@@ -12,17 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/status.h>
 #include <string.h>
 
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/util/time.h"
diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc
index 268b699b427..d1eb7781937 100644
--- a/test/core/end2end/tests/trailing_metadata.cc
+++ b/test/core/end2end/tests/trailing_metadata.cc
@@ -16,12 +16,11 @@
 //
 //
 
+#include <grpc/status.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/status.h>
-
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/write_buffering.cc b/test/core/end2end/tests/write_buffering.cc
index d3956f80031..c29bcca9d28 100644
--- a/test/core/end2end/tests/write_buffering.cc
+++ b/test/core/end2end/tests/write_buffering.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/end2end/tests/write_buffering_at_end.cc b/test/core/end2end/tests/write_buffering_at_end.cc
index 064e979e8fb..517a8820a10 100644
--- a/test/core/end2end/tests/write_buffering_at_end.cc
+++ b/test/core/end2end/tests/write_buffering_at_end.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 #include "test/core/end2end/end2end_tests.h"
 
diff --git a/test/core/event_engine/cf/cf_engine_test.cc b/test/core/event_engine/cf/cf_engine_test.cc
index 07ed18aa994..f6ac8c0ac6e 100644
--- a/test/core/event_engine/cf/cf_engine_test.cc
+++ b/test/core/event_engine/cf/cf_engine_test.cc
@@ -16,6 +16,9 @@
 
 #ifdef GPR_APPLE
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+
 #include <thread>
 
 #include "absl/log/check.h"
@@ -23,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/cf_engine/cf_engine.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/common_closures_test.cc b/test/core/event_engine/common_closures_test.cc
index a09d2061d69..b3a8fa39bbf 100644
--- a/test/core/event_engine/common_closures_test.cc
+++ b/test/core/event_engine/common_closures_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/event_engine/common_closures.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/notification.h"
 
 using ::grpc_event_engine::experimental::AnyInvocableClosure;
diff --git a/test/core/event_engine/default_engine_methods_test.cc b/test/core/event_engine/default_engine_methods_test.cc
index 030be18a504..04a415c1d9d 100644
--- a/test/core/event_engine/default_engine_methods_test.cc
+++ b/test/core/event_engine/default_engine_methods_test.cc
@@ -11,6 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <thread>
@@ -22,13 +28,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/event_engine/endpoint_config_test.cc b/test/core/event_engine/endpoint_config_test.cc
index 5a23b5e3263..f406481f9ec 100644
--- a/test/core/event_engine/endpoint_config_test.cc
+++ b/test/core/event_engine/endpoint_config_test.cc
@@ -11,13 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 
diff --git a/test/core/event_engine/event_engine_test_utils.cc b/test/core/event_engine/event_engine_test_utils.cc
index 65b609a63d4..c2a02d4dad5 100644
--- a/test/core/event_engine/event_engine_test_utils.cc
+++ b/test/core/event_engine/event_engine_test_utils.cc
@@ -14,6 +14,11 @@
 
 #include "test/core/event_engine/event_engine_test_utils.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice_buffer.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -30,13 +35,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice_buffer.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/test/core/event_engine/event_engine_test_utils.h b/test/core/event_engine/event_engine_test_utils.h
index fa0f3622e1a..1cc09380fc5 100644
--- a/test/core/event_engine/event_engine_test_utils.h
+++ b/test/core/event_engine/event_engine_test_utils.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_EVENT_ENGINE_TEST_UTILS_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_EVENT_ENGINE_TEST_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -27,10 +30,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/event_engine/factory_test.cc b/test/core/event_engine/factory_test.cc
index 370a7577f72..b8239dce4fe 100644
--- a/test/core/event_engine/factory_test.cc
+++ b/test/core/event_engine/factory_test.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "test/core/event_engine/util/aborting_event_engine.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/event_engine/forkable_test.cc b/test/core/event_engine/forkable_test.cc
index 86dbe636593..2b1da1d0b09 100644
--- a/test/core/event_engine/forkable_test.cc
+++ b/test/core/event_engine/forkable_test.cc
@@ -28,7 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
index 1bc8a7a203e..7c24b1abfb8 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
+#include <grpc/event_engine/slice.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -26,10 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
index 6ff76e32a23..180943c882c 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_FUZZING_EVENT_ENGINE_FUZZING_EVENT_ENGINE_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_FUZZING_EVENT_ENGINE_FUZZING_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <atomic>
@@ -34,13 +39,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/util/no_destruct.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
index e5eb79fccc3..0d89448a2f7 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine_unittest.cc
@@ -16,11 +16,10 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
-#include "absl/synchronization/notification.h"
-#include "gtest/gtest.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/synchronization/notification.h"
+#include "gtest/gtest.h"
 #include "src/core/util/time.h"
 
 using ::grpc_event_engine::experimental::FuzzingEventEngine;
diff --git a/test/core/event_engine/handle_tests.cc b/test/core/event_engine/handle_tests.cc
index 9e082c23a0e..864d9547246 100644
--- a/test/core/event_engine/handle_tests.cc
+++ b/test/core/event_engine/handle_tests.cc
@@ -11,14 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 using ::grpc_event_engine::experimental::EventEngine;
 
 template <typename T>
diff --git a/test/core/event_engine/mock_event_engine.h b/test/core/event_engine/mock_event_engine.h
index 62266bdb12d..9036e7af6d1 100644
--- a/test/core/event_engine/mock_event_engine.h
+++ b/test/core/event_engine/mock_event_engine.h
@@ -15,6 +15,10 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_MOCK_EVENT_ENGINE_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_MOCK_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
@@ -22,10 +26,6 @@
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc
index 673c4f9c78a..87ab1fc8038 100644
--- a/test/core/event_engine/posix/event_poller_posix_test.cc
+++ b/test/core/event_engine/posix/event_poller_posix_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <sys/select.h>
 
@@ -28,9 +29,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
@@ -46,6 +44,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdlib.h>
@@ -54,10 +54,6 @@
 
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller_posix_default.h"
diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc
index f53aea94ad5..1b0ffac0d37 100644
--- a/test/core/event_engine/posix/lock_free_event_test.cc
+++ b/test/core/event_engine/posix/lock_free_event_test.cc
@@ -12,22 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 #include <thread>
 #include <utility>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 #include "src/core/lib/event_engine/posix_engine/lockfree_event.h"
diff --git a/test/core/event_engine/posix/log_too_many_open_files_test.cc b/test/core/event_engine/posix/log_too_many_open_files_test.cc
index c87b879a286..8b2dc68679a 100644
--- a/test/core/event_engine/posix/log_too_many_open_files_test.cc
+++ b/test/core/event_engine/posix/log_too_many_open_files_test.cc
@@ -21,7 +21,6 @@
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/util/strerror.h"
diff --git a/test/core/event_engine/posix/posix_endpoint_test.cc b/test/core/event_engine/posix/posix_endpoint_test.cc
index a8ec3af12c5..5ad8bb7d937 100644
--- a/test/core/event_engine/posix/posix_endpoint_test.cc
+++ b/test/core/event_engine/posix/posix_endpoint_test.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/lib/event_engine/posix_engine/posix_endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <chrono>
 #include <list>
@@ -30,11 +34,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
index 319d8098b06..1e44d7633ad 100644
--- a/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
+++ b/test/core/event_engine/posix/posix_engine_listener_utils_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -23,9 +24,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 // This test won't work except with posix sockets enabled
@@ -34,7 +32,6 @@
 #include <ifaddrs.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/posix/posix_engine_test_utils.cc b/test/core/event_engine/posix/posix_engine_test_utils.cc
index 30c7f408804..88da5686515 100644
--- a/test/core/event_engine/posix/posix_engine_test_utils.cc
+++ b/test/core/event_engine/posix/posix_engine_test_utils.cc
@@ -22,7 +22,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/posix/posix_engine_test_utils.h b/test/core/event_engine/posix/posix_engine_test_utils.h
index 33deec80818..34e83c4a124 100644
--- a/test/core/event_engine/posix/posix_engine_test_utils.h
+++ b/test/core/event_engine/posix/posix_engine_test_utils.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_POSIX_POSIX_ENGINE_TEST_UTILS_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_POSIX_POSIX_ENGINE_TEST_UTILS_H
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <utility>
 
 #include "absl/functional/any_invocable.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/posix_engine/event_poller.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/posix/posix_event_engine_connect_test.cc b/test/core/event_engine/posix/posix_event_engine_connect_test.cc
index 989e6c9f341..19f2819c51e 100644
--- a/test/core/event_engine/posix/posix_event_engine_connect_test.cc
+++ b/test/core/event_engine/posix/posix_event_engine_connect_test.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
 #include <poll.h>
 #include <stdlib.h>
 #include <sys/socket.h>
@@ -34,11 +37,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
diff --git a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
index 0e1099b57aa..99db037a195 100644
--- a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
+++ b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
 #include <sys/socket.h>
 #include <unistd.h>
 
@@ -19,9 +20,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 // IWYU pragma: no_include <arpa/inet.h>
@@ -29,11 +27,10 @@
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 
+#include <grpc/support/alloc.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/util/useful.h"
diff --git a/test/core/event_engine/posix/timer_heap_test.cc b/test/core/event_engine/posix/timer_heap_test.cc
index ee1a82e6e0b..5d71ee6f52e 100644
--- a/test/core/event_engine/posix/timer_heap_test.cc
+++ b/test/core/event_engine/posix/timer_heap_test.cc
@@ -27,7 +27,6 @@
 #include "absl/log/check.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/util/bitset.h"
 
diff --git a/test/core/event_engine/posix/timer_list_test.cc b/test/core/event_engine/posix/timer_list_test.cc
index 0fae801fb94..ca3aa663949 100644
--- a/test/core/event_engine/posix/timer_list_test.cc
+++ b/test/core/event_engine/posix/timer_list_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/time.h>
+
 #include <cstdint>
 #include <limits>
 #include <vector>
@@ -23,10 +26,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/util/time.h"
 
diff --git a/test/core/event_engine/posix/timer_manager_test.cc b/test/core/event_engine/posix/timer_manager_test.cc
index 1cfe58a2d80..40f53540b75 100644
--- a/test/core/event_engine/posix/timer_manager_test.cc
+++ b/test/core/event_engine/posix/timer_manager_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/event_engine/posix_engine/timer_manager.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 #include <random>
@@ -23,9 +25,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
diff --git a/test/core/event_engine/posix/traced_buffer_list_test.cc b/test/core/event_engine/posix/traced_buffer_list_test.cc
index 9e267fe1d3f..1d460aac166 100644
--- a/test/core/event_engine/posix/traced_buffer_list_test.cc
+++ b/test/core/event_engine/posix/traced_buffer_list_test.cc
@@ -14,16 +14,14 @@
 
 #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h"
 
+#include <grpc/support/atm.h>
+#include <grpc/support/time.h>
 #include <time.h>
 
 #include <memory>
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/atm.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/time.h"
diff --git a/test/core/event_engine/posix/wakeup_fd_posix_test.cc b/test/core/event_engine/posix/wakeup_fd_posix_test.cc
index b9872eede12..e2d11bba602 100644
--- a/test/core/event_engine/posix/wakeup_fd_posix_test.cc
+++ b/test/core/event_engine/posix/wakeup_fd_posix_test.cc
@@ -18,7 +18,6 @@
 
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h"
 #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h"
 
diff --git a/test/core/event_engine/query_extensions_test.cc b/test/core/event_engine/query_extensions_test.cc
index d657f43b81f..0c10b76cc29 100644
--- a/test/core/event_engine/query_extensions_test.cc
+++ b/test/core/event_engine/query_extensions_test.cc
@@ -13,16 +13,15 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/query_extensions.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/crash.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/slice_buffer_test.cc b/test/core/event_engine/slice_buffer_test.cc
index 0a0c26f9520..a3221ac6743 100644
--- a/test/core/event_engine/slice_buffer_test.cc
+++ b/test/core/event_engine/slice_buffer_test.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -20,12 +25,6 @@
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
 
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 using ::grpc_event_engine::experimental::Slice;
 using ::grpc_event_engine::experimental::SliceBuffer;
 
diff --git a/test/core/event_engine/smoke_test.cc b/test/core/event_engine/smoke_test.cc
index e557a8c4e45..0a53992b15e 100644
--- a/test/core/event_engine/smoke_test.cc
+++ b/test/core/event_engine/smoke_test.cc
@@ -11,15 +11,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 namespace {
diff --git a/test/core/event_engine/tcp_socket_utils_test.cc b/test/core/event_engine/tcp_socket_utils_test.cc
index 53ce735e478..fc926592685 100644
--- a/test/core/event_engine/tcp_socket_utils_test.cc
+++ b/test/core/event_engine/tcp_socket_utils_test.cc
@@ -14,7 +14,6 @@
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 
 #include <errno.h>
-
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
@@ -45,13 +44,12 @@
 #endif  // GPR_WINDOWS
 #endif  // GRPC_HAVE_UNIX_SOCKET
 
+#include <grpc/event_engine/event_engine.h>
+
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/event_engine/test_init.cc b/test/core/event_engine/test_init.cc
index 2b7600ce0d2..1a342794345 100644
--- a/test/core/event_engine/test_init.cc
+++ b/test/core/event_engine/test_init.cc
@@ -13,12 +13,12 @@
 // limitations under the License.
 #include "test/core/event_engine/test_init.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/strings/str_cat.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/test_init.h b/test/core/event_engine/test_init.h
index 7ab584d07f3..2af682f523f 100644
--- a/test/core/event_engine/test_init.h
+++ b/test/core/event_engine/test_init.h
@@ -13,11 +13,11 @@
 // limitations under the License.
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H
+#include <grpc/support/port_platform.h>
+
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/test_suite/event_engine_test_framework.cc b/test/core/event_engine/test_suite/event_engine_test_framework.cc
index 962d9e4d074..2affed14094 100644
--- a/test/core/event_engine/test_suite/event_engine_test_framework.cc
+++ b/test/core/event_engine/test_suite/event_engine_test_framework.cc
@@ -13,9 +13,8 @@
 // limitations under the License.
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/event_engine/event_engine.h>
+#include <gtest/gtest.h>
 
 absl::AnyInvocable<
     std::shared_ptr<grpc_event_engine::experimental::EventEngine>()>*
diff --git a/test/core/event_engine/test_suite/event_engine_test_framework.h b/test/core/event_engine/test_suite/event_engine_test_framework.h
index 0f2b768637a..afb57911e2b 100644
--- a/test/core/event_engine/test_suite/event_engine_test_framework.h
+++ b/test/core/event_engine/test_suite/event_engine_test_framework.h
@@ -14,16 +14,15 @@
 
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_FRAMEWORK_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_FRAMEWORK_H
+#include <grpc/event_engine/event_engine.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/event_engine/event_engine.h>
-
 extern absl::AnyInvocable<
     std::shared_ptr<grpc_event_engine::experimental::EventEngine>()>*
     g_ee_factory;
diff --git a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc
index afd288bcc0a..e2c718f9166 100644
--- a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc
+++ b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc
@@ -14,10 +14,10 @@
 
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 
-#include <chrono>
-
 #include <gtest/gtest.h>
 
+#include <chrono>
+
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
 #include "test/core/event_engine/test_suite/tests/timer_test.h"
 
diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
index 3efef67009f..b5f0c70ceb9 100644
--- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
+++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/alloc.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -30,10 +32,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h
index 94fbb928832..6db3489c030 100644
--- a/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h
+++ b/test/core/event_engine/test_suite/posix/oracle_event_engine_posix.h
@@ -15,6 +15,11 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_POSIX_ORACLE_EVENT_ENGINE_POSIX_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_POSIX_ORACLE_EVENT_ENGINE_POSIX_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice_buffer.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -24,12 +29,6 @@
 #include "absl/functional/any_invocable.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice_buffer.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
index fc864f89078..682d4402d80 100644
--- a/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
+++ b/test/core/event_engine/test_suite/posix_event_engine_native_dns_test.cc
@@ -11,14 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <optional>
 #include <string>
 
-#include <gtest/gtest.h>
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
diff --git a/test/core/event_engine/test_suite/posix_event_engine_test.cc b/test/core/event_engine/test_suite/posix_event_engine_test.cc
index 26c34c9a9f8..605431a95dd 100644
--- a/test/core/event_engine/test_suite/posix_event_engine_test.cc
+++ b/test/core/event_engine/test_suite/posix_event_engine_test.cc
@@ -11,11 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
+#include <memory>
 
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
diff --git a/test/core/event_engine/test_suite/tests/client_test.cc b/test/core/event_engine/test_suite/tests/client_test.cc
index c6bd435a3cb..fd6c22067d5 100644
--- a/test/core/event_engine/test_suite/tests/client_test.cc
+++ b/test/core/event_engine/test_suite/tests/client_test.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <chrono>
 #include <memory>
@@ -29,11 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/test_suite/tests/dns_test.cc b/test/core/event_engine/test_suite/tests/dns_test.cc
index a50102970ed..1613085a42d 100644
--- a/test/core/event_engine/test_suite/tests/dns_test.cc
+++ b/test/core/event_engine/test_suite/tests/dns_test.cc
@@ -15,6 +15,9 @@
 // IWYU pragma: no_include <ratio>
 // IWYU pragma: no_include <arpa/inet.h>
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <cstdlib>
 #include <cstring>
 #include <memory>
@@ -31,10 +34,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/event_engine/test_suite/tests/server_test.cc b/test/core/event_engine/test_suite/tests/server_test.cc
index 88e64ef04e0..630dc7c7dd5 100644
--- a/test/core/event_engine/test_suite/tests/server_test.cc
+++ b/test/core/event_engine/test_suite/tests/server_test.cc
@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/impl/channel_arg_names.h>
+
 #include <algorithm>
 #include <chrono>
 #include <memory>
@@ -29,11 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/event_engine/test_suite/tests/timer_test.cc b/test/core/event_engine/test_suite/tests/timer_test.cc
index c4a4e5cc35a..bc25e6e1bbc 100644
--- a/test/core/event_engine/test_suite/tests/timer_test.cc
+++ b/test/core/event_engine/test_suite/tests/timer_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -31,9 +33,6 @@
 #include "absl/time/time.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-
 #include "src/core/lib/event_engine/time_util.h"
 #include "src/core/util/sync.h"
 #include "test/core/event_engine/test_suite/event_engine_test_framework.h"
diff --git a/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc b/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc
index 43088eb5bb3..6ebd37ffb39 100644
--- a/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc
+++ b/test/core/event_engine/test_suite/thready_posix_event_engine_test.cc
@@ -11,11 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <memory>
-
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
+#include <memory>
 
 #include "src/core/lib/event_engine/posix_engine/posix_engine.h"
 #include "src/core/lib/event_engine/thready_event_engine/thready_event_engine.h"
diff --git a/test/core/event_engine/test_suite/tools/echo_client.cc b/test/core/event_engine/test_suite/tools/echo_client.cc
index 76749f58309..f44ddae72e6 100644
--- a/test/core/event_engine/test_suite/tools/echo_client.cc
+++ b/test/core/event_engine/test_suite/tools/echo_client.cc
@@ -11,13 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/slice.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/event_engine/slice.h>
-#include <grpc/support/port_platform.h>
-
 // The echo client wraps an EventEngine::Connect and EventEngine::Endpoint
 // implementations, allowing third-party TCP listeners to interact with your
 // EventEngine client. Example usage:
@@ -31,6 +30,10 @@
 //    bazel run
 //    //test/core/event_engine/test_suite/tools:my_event_engine_echo_client
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+
 #include <chrono>
 #include <memory>
 #include <string>
@@ -43,11 +46,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc b/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc
index 9b7d2ae8a5a..c107ef47f3b 100644
--- a/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc
+++ b/test/core/event_engine/test_suite/tools/posix_event_engine_factory.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_POSIX_SOCKET_TCP
diff --git a/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc b/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc
index 98f591fe604..2fa66748d82 100644
--- a/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc
+++ b/test/core/event_engine/test_suite/tools/windows_event_engine_factory.cc
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #ifdef GPR_WINDOWS
 
 #include "src/core/lib/event_engine/windows/windows_engine.h"
diff --git a/test/core/event_engine/thread_pool_test.cc b/test/core/event_engine/thread_pool_test.cc
index 29f32d16691..1c4d29c44e7 100644
--- a/test/core/event_engine/thread_pool_test.cc
+++ b/test/core/event_engine/thread_pool_test.cc
@@ -13,6 +13,9 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/thd_id.h>
+
 #include <atomic>
 #include <chrono>
 #include <cmath>
@@ -26,10 +29,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/thd_id.h>
-
 #include "src/core/lib/event_engine/thread_pool/thread_count.h"
 #include "src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/event_engine/util/aborting_event_engine.h b/test/core/event_engine/util/aborting_event_engine.h
index ecc2db968dd..9c49a2b2b6a 100644
--- a/test/core/event_engine/util/aborting_event_engine.h
+++ b/test/core/event_engine/util/aborting_event_engine.h
@@ -14,6 +14,10 @@
 #ifndef GRPC_TEST_CORE_EVENT_ENGINE_UTIL_ABORTING_EVENT_ENGINE_H
 #define GRPC_TEST_CORE_EVENT_ENGINE_UTIL_ABORTING_EVENT_ENGINE_H
 
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -22,11 +26,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_event_engine {
 namespace experimental {
 
diff --git a/test/core/event_engine/windows/create_sockpair.cc b/test/core/event_engine/windows/create_sockpair.cc
index 3817f98ac6f..7de56720da7 100644
--- a/test/core/event_engine/windows/create_sockpair.cc
+++ b/test/core/event_engine/windows/create_sockpair.cc
@@ -20,7 +20,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/status.h"
-
 #include "src/core/lib/event_engine/windows/win_socket.h"
 #include "src/core/lib/iomgr/error.h"
 #include "test/core/event_engine/windows/create_sockpair.h"
diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc
index b5ee504c643..9e798ff7e21 100644
--- a/test/core/event_engine/windows/iocp_test.cc
+++ b/test/core/event_engine/windows/iocp_test.cc
@@ -14,19 +14,17 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
-#include <thread>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log_windows.h>
 #include <gtest/gtest.h>
 
+#include <thread>
+
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/time/time.h"
 #include "absl/types/variant.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
diff --git a/test/core/event_engine/windows/win_socket_test.cc b/test/core/event_engine/windows/win_socket_test.cc
index daa3c5360f5..e0902a81bd3 100644
--- a/test/core/event_engine/windows/win_socket_test.cc
+++ b/test/core/event_engine/windows/win_socket_test.cc
@@ -15,14 +15,12 @@
 #include <grpc/support/port_platform.h>
 
 #ifdef GPR_WINDOWS
+#include <grpc/grpc.h>
+#include <grpc/support/log_windows.h>
 #include <gtest/gtest.h>
 
 #include "absl/status/status.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log_windows.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/test/core/event_engine/windows/windows_endpoint_test.cc b/test/core/event_engine/windows/windows_endpoint_test.cc
index 9ada4bbf471..e06b3928350 100644
--- a/test/core/event_engine/windows/windows_endpoint_test.cc
+++ b/test/core/event_engine/windows/windows_endpoint_test.cc
@@ -16,13 +16,11 @@
 
 #ifdef GPR_WINDOWS
 
-#include <gtest/gtest.h>
-
-#include "absl/status/status.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
+#include <gtest/gtest.h>
 
+#include "absl/status/status.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
diff --git a/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc b/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc
index be59f7ecdb8..9481282ea5e 100644
--- a/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc
+++ b/test/core/event_engine/work_queue/basic_work_queue_fuzzer.cc
@@ -11,6 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <deque>
@@ -19,10 +21,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 #include "src/libfuzzer/libfuzzer_macro.h"
diff --git a/test/core/event_engine/work_queue/basic_work_queue_test.cc b/test/core/event_engine/work_queue/basic_work_queue_test.cc
index e5658f85c0a..a8ecefb928b 100644
--- a/test/core/event_engine/work_queue/basic_work_queue_test.cc
+++ b/test/core/event_engine/work_queue/basic_work_queue_test.cc
@@ -13,15 +13,14 @@
 // limitations under the License.
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <thread>
 #include <vector>
 
 #include "absl/functional/any_invocable.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/experiments/experiments_tag_test.cc b/test/core/experiments/experiments_tag_test.cc
index 51643148209..63d42a7bd3b 100644
--- a/test/core/experiments/experiments_tag_test.cc
+++ b/test/core/experiments/experiments_tag_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/status/status.h"
@@ -20,9 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/experiments/config.h"
 #include "test/core/experiments/fixtures/experiments.h"
diff --git a/test/core/experiments/experiments_test.cc b/test/core/experiments/experiments_test.cc
index f604efa05ff..2964104c3dd 100644
--- a/test/core/experiments/experiments_test.cc
+++ b/test/core/experiments/experiments_test.cc
@@ -16,12 +16,11 @@
 
 #include "test/core/experiments/fixtures/experiments.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/experiments/config.h"
 
 #ifndef GRPC_EXPERIMENTS_ARE_FINAL
diff --git a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
index 56e8783629b..202ead109fb 100644
--- a/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
+++ b/test/core/ext/filters/event_engine_client_channel_resolver/resolver_fuzzer.cc
@@ -11,6 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -25,10 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
index 369ebcc468d..43985c9d5c6 100644
--- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
+++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc
@@ -14,6 +14,10 @@
 
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/slice.h>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -23,11 +27,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/slice.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/filters/bm_http_client_filter.cc b/test/core/filters/bm_http_client_filter.cc
index 967af7ab6a4..0e295d86fec 100644
--- a/test/core/filters/bm_http_client_filter.cc
+++ b/test/core/filters/bm_http_client_filter.cc
@@ -13,11 +13,9 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/strings/string_view.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/transport/connectivity_state.h"
diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc
index f6a29e17d89..b4cdef1abe5 100644
--- a/test/core/filters/client_auth_filter_test.cc
+++ b/test/core/filters/client_auth_filter_test.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+
 #include <string>
 #include <utility>
 
@@ -20,12 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/arena_promise.h"
diff --git a/test/core/filters/client_authority_filter_test.cc b/test/core/filters/client_authority_filter_test.cc
index cdb99d9999d..62e85416ac6 100644
--- a/test/core/filters/client_authority_filter_test.cc
+++ b/test/core/filters/client_authority_filter_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/ext/filters/http/client_authority_filter.h"
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "test/core/filters/filter_test.h"
 
 using ::testing::StrictMock;
diff --git a/test/core/filters/filter_test.cc b/test/core/filters/filter_test.cc
index 11ff4cfa087..e710abc43b9 100644
--- a/test/core/filters/filter_test.cc
+++ b/test/core/filters/filter_test.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/filters/filter_test.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <chrono>
 #include <memory>
@@ -24,9 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/call_finalization.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/filters/filter_test.h b/test/core/filters/filter_test.h
index 4c193efce31..13a9a80e8a1 100644
--- a/test/core/filters/filter_test.h
+++ b/test/core/filters/filter_test.h
@@ -15,6 +15,9 @@
 #ifndef GRPC_TEST_CORE_FILTERS_FILTER_TEST_H
 #define GRPC_TEST_CORE_FILTERS_FILTER_TEST_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <gtest/gtest.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -25,17 +28,11 @@
 #include <string>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/filters/filter_test_test.cc b/test/core/filters/filter_test_test.cc
index ec836316f86..6da52c84be4 100644
--- a/test/core/filters/filter_test_test.cc
+++ b/test/core/filters/filter_test_test.cc
@@ -14,6 +14,8 @@
 
 #include "test/core/filters/filter_test.h"
 
+#include <grpc/compression.h>
+
 #include <functional>
 #include <memory>
 #include <type_traits>
@@ -22,9 +24,6 @@
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/compression.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/activity.h"
diff --git a/test/core/filters/gcp_authentication_filter_test.cc b/test/core/filters/gcp_authentication_filter_test.cc
index 5f3880fa998..e75706b4ea0 100644
--- a/test/core/filters/gcp_authentication_filter_test.cc
+++ b/test/core/filters/gcp_authentication_filter_test.cc
@@ -22,7 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/security/context/security_context.h"
diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc
index 3032abf8ced..1a8035cc104 100644
--- a/test/core/handshake/client_ssl.cc
+++ b/test/core/handshake/client_ssl.cc
@@ -16,21 +16,18 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
-#include <stdint.h>
-#include <stdio.h>
-
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
+#include <stdint.h>
+#include <stdio.h>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/port.h"
 #include "test/core/test_util/test_config.h"
@@ -40,6 +37,11 @@
 // This test won't work except with posix sockets enabled
 #ifdef GRPC_POSIX_SOCKET_TCP
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -47,16 +49,8 @@
 
 #include <string>
 
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/handshake/http_proxy_mapper_test.cc b/test/core/handshake/http_proxy_mapper_test.cc
index 1c7d40e022d..30741b71589 100644
--- a/test/core/handshake/http_proxy_mapper_test.cc
+++ b/test/core/handshake/http_proxy_mapper_test.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/handshaker/http_connect/http_proxy_mapper.h"
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/impl/channel_arg_names.h>
-
 #include "src/core/handshaker/http_connect/http_connect_handshaker.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc
index 9b4203ec6f2..e8401f084f6 100644
--- a/test/core/handshake/readahead_handshaker_server_ssl.cc
+++ b/test/core/handshake/readahead_handshaker_server_ssl.cc
@@ -16,14 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/handshaker_factory.h"
 #include "src/core/handshaker/handshaker_registry.h"
diff --git a/test/core/handshake/server_ssl.cc b/test/core/handshake/server_ssl.cc
index 9776d7330e4..7910251502e 100644
--- a/test/core/handshake/server_ssl.cc
+++ b/test/core/handshake/server_ssl.cc
@@ -19,7 +19,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "test/core/handshake/server_ssl_common.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc
index 7a8910fac34..a026e7c9fba 100644
--- a/test/core/handshake/server_ssl_common.cc
+++ b/test/core/handshake/server_ssl_common.cc
@@ -18,7 +18,18 @@
 
 #include "test/core/handshake/server_ssl_common.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,24 +39,10 @@
 
 #include <string>
 
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/ssl.h>
-
 #include "absl/base/thread_annotations.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/handshake/verify_peer_options.cc b/test/core/handshake/verify_peer_options.cc
index 626dc964468..96e9d4cd79c 100644
--- a/test/core/handshake/verify_peer_options.cc
+++ b/test/core/handshake/verify_peer_options.cc
@@ -22,6 +22,12 @@
 #ifdef GRPC_POSIX_SOCKET_TCP
 
 #include <arpa/inet.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -29,18 +35,9 @@
 
 #include <string>
 
-#include <openssl/err.h>
-#include <openssl/ssl.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/thd.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc
index 31c73d88100..2d2deb6d4bb 100644
--- a/test/core/http/format_request_test.cc
+++ b/test/core/http/format_request_test.cc
@@ -23,7 +23,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc
index 0f9b26ab912..53b6236ba0d 100644
--- a/test/core/http/httpcli_test.cc
+++ b/test/core/http/httpcli_test.cc
@@ -18,6 +18,14 @@
 
 #include "src/core/util/http_client/httpcli.h"
 
+#include <ares.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <string.h>
 #include <sys/socket.h>
 
@@ -26,23 +34,12 @@
 #include <thread>
 #include <utility>
 
-#include <ares.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/test/core/http/httpcli_test_util.cc b/test/core/http/httpcli_test_util.cc
index f47bb1d61a8..6ba8c6d1d7d 100644
--- a/test/core/http/httpcli_test_util.cc
+++ b/test/core/http/httpcli_test_util.cc
@@ -16,6 +16,10 @@
 
 #include "test/core/http/httpcli_test_util.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,12 +30,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/subprocess.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc
index 11596745a6d..0f051f6a860 100644
--- a/test/core/http/httpscli_test.cc
+++ b/test/core/http/httpscli_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,21 +32,12 @@
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc
index 4e3f508338a..a7ff86e5cc6 100644
--- a/test/core/http/parser_test.cc
+++ b/test/core/http/parser_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/util/http_client/parser.h"
 
+#include <grpc/support/alloc.h>
 #include <stdarg.h>
 #include <string.h>
 
@@ -26,9 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/useful.h"
 #include "test/core/test_util/slice_splitter.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/http/request_fuzzer.cc b/test/core/http/request_fuzzer.cc
index 7ca890c7e01..aef8b6424f5 100644
--- a/test/core/http/request_fuzzer.cc
+++ b/test/core/http/request_fuzzer.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/util/http_client/parser.h"
 
diff --git a/test/core/http/response_fuzzer.cc b/test/core/http/response_fuzzer.cc
index e2cadb79eb8..377098028e3 100644
--- a/test/core/http/response_fuzzer.cc
+++ b/test/core/http/response_fuzzer.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/util/http_client/parser.h"
 
diff --git a/test/core/iomgr/buffer_list_test.cc b/test/core/iomgr/buffer_list_test.cc
index d6620314c29..f80a2a53ff9 100644
--- a/test/core/iomgr/buffer_list_test.cc
+++ b/test/core/iomgr/buffer_list_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/iomgr/buffer_list.h"
 
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/internal_errqueue.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc
index 1e3daba3978..7c7d66e918d 100644
--- a/test/core/iomgr/combiner_test.cc
+++ b/test/core/iomgr/combiner_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/iomgr/combiner.h"
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+
+#include <thread>
 
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc
index 76518fa5cd0..532d40203fa 100644
--- a/test/core/iomgr/endpoint_pair_test.cc
+++ b/test/core/iomgr/endpoint_pair_test.cc
@@ -18,18 +18,16 @@
 
 #include "src/core/lib/iomgr/endpoint_pair.h"
 
-#include <chrono>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
+#include <gtest/gtest.h>
+
+#include <chrono>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc
index 5f0044bb6f0..b20245aad53 100644
--- a/test/core/iomgr/endpoint_tests.cc
+++ b/test/core/iomgr/endpoint_tests.cc
@@ -18,17 +18,15 @@
 
 #include "test/core/iomgr/endpoint_tests.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <sys/types.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/error_test.cc b/test/core/iomgr/error_test.cc
index 93ce01db702..2ff779733bb 100644
--- a/test/core/iomgr/error_test.cc
+++ b/test/core/iomgr/error_test.cc
@@ -18,16 +18,13 @@
 
 #include "src/core/lib/iomgr/error.h"
 
-#include <string.h>
-
 #include <gmock/gmock.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/strerror.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc
index 8a75b4f41e2..8d1f7844cbb 100644
--- a/test/core/iomgr/fd_conservation_posix_test.cc
+++ b/test/core/iomgr/fd_conservation_posix_test.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <sys/resource.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc
index 4de02c79db3..875bbf5e0be 100644
--- a/test/core/iomgr/fd_posix_test.cc
+++ b/test/core/iomgr/fd_posix_test.cc
@@ -27,6 +27,10 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <stdio.h>
@@ -38,12 +42,6 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
diff --git a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc
index e1d615ea9ca..db1da269193 100644
--- a/test/core/iomgr/grpc_ipv6_loopback_available_test.cc
+++ b/test/core/iomgr/grpc_ipv6_loopback_available_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/pollset_windows_starvation_test.cc b/test/core/iomgr/pollset_windows_starvation_test.cc
index dc75b1f61d6..b921e19f162 100644
--- a/test/core/iomgr/pollset_windows_starvation_test.cc
+++ b/test/core/iomgr/pollset_windows_starvation_test.cc
@@ -15,11 +15,11 @@
 // limitations under the License.
 //
 //
-#include <vector>
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 
+#include <vector>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc
index 1c0eecfa04c..0d3deea8ba4 100644
--- a/test/core/iomgr/resolve_address_posix_test.cc
+++ b/test/core/iomgr/resolve_address_posix_test.cc
@@ -16,24 +16,21 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <net/if.h>
 #include <string.h>
 #include <sys/un.h>
 
 #include <string>
 
-#include <gtest/gtest.h>
-
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc
index 97da4df464c..db0c041c470 100644
--- a/test/core/iomgr/resolve_address_test.cc
+++ b/test/core/iomgr/resolve_address_test.cc
@@ -18,22 +18,19 @@
 
 #include "src/core/lib/iomgr/resolve_address.h"
 
-#include <string.h>
-
 #include <address_sorting/address_sorting.h>
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <gtest/gtest.h>
+#include <string.h>
 
 #include "absl/functional/bind_front.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/test/core/iomgr/socket_utils_test.cc b/test/core/iomgr/socket_utils_test.cc
index 861ea5eae25..fa492c8c204 100644
--- a/test/core/iomgr/socket_utils_test.cc
+++ b/test/core/iomgr/socket_utils_test.cc
@@ -22,17 +22,14 @@
 #ifdef GRPC_POSIX_SOCKET_UTILS_COMMON
 
 #include <errno.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <gtest/gtest.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc
index 6a567765b38..bdfb8a9ab9d 100644
--- a/test/core/iomgr/tcp_client_posix_test.cc
+++ b/test/core/iomgr/tcp_client_posix_test.cc
@@ -30,6 +30,9 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <netinet/in.h>
 #include <poll.h>
 #include <string.h>
@@ -37,11 +40,6 @@
 #include <unistd.h>
 
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/iomgr/pollset_set.h"
diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc
index 897df84cf3e..35a7018075b 100644
--- a/test/core/iomgr/tcp_posix_test.cc
+++ b/test/core/iomgr/tcp_posix_test.cc
@@ -17,7 +17,6 @@
 //
 
 #include "absl/time/time.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/notification.h"
@@ -28,21 +27,18 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <limits.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/posix.h"
diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc
index 09c4a5c0d83..86a7e30ab32 100644
--- a/test/core/iomgr/tcp_server_posix_test.cc
+++ b/test/core/iomgr/tcp_server_posix_test.cc
@@ -39,16 +39,15 @@
 #include <sys/un.h>
 #endif
 
-#include <memory>
-#include <string>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include <memory>
+#include <string>
+
+#include "absl/log/log.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/iomgr/timer_heap_test.cc b/test/core/iomgr/timer_heap_test.cc
index 3e2b907e7b5..4882fb2fda2 100644
--- a/test/core/iomgr/timer_heap_test.cc
+++ b/test/core/iomgr/timer_heap_test.cc
@@ -18,15 +18,12 @@
 
 #include "src/core/lib/iomgr/timer_heap.h"
 
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index cd0a5221d60..ffe81cd0a5e 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -16,6 +16,7 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <string.h>
 
 #include <cstdint>
@@ -23,9 +24,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/core/json/fuzzer.cc b/test/core/json/fuzzer.cc
index bc17d74af3d..3191f0a00c4 100644
--- a/test/core/json/fuzzer.cc
+++ b/test/core/json/fuzzer.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/support/json.h>
 #include <stdint.h>
 #include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 
diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc
index aad3567f86b..385c8ef93bb 100644
--- a/test/core/json/json_object_loader_test.cc
+++ b/test/core/json/json_object_loader_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/util/json/json_object_loader.h"
 
+#include <grpc/support/json.h>
+
 #include <cstdint>
 
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/json.h>
-
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/ref_counted.h"
diff --git a/test/core/json/json_test.cc b/test/core/json/json_test.cc
index cf9f68cf212..2e44c6636ad 100644
--- a/test/core/json/json_test.cc
+++ b/test/core/json/json_test.cc
@@ -29,7 +29,6 @@
 #include "absl/strings/str_cat.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/load_balancing/bm_picker.cc b/test/core/load_balancing/bm_picker.cc
index 51aee364d3f..b596ef553bc 100644
--- a/test/core/load_balancing/bm_picker.cc
+++ b/test/core/load_balancing/bm_picker.cc
@@ -12,14 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/strings/string_view.h"
-
 #include <grpc/grpc.h>
 
+#include <memory>
+
+#include "absl/strings/string_view.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/load_balancing/lb_policy_test_lib.h b/test/core/load_balancing/lb_policy_test_lib.h
index 00c21dcd9a3..2280ae6833f 100644
--- a/test/core/load_balancing/lb_policy_test_lib.h
+++ b/test/core/load_balancing/lb_policy_test_lib.h
@@ -17,6 +17,10 @@
 #ifndef GRPC_TEST_CORE_LOAD_BALANCING_LB_POLICY_TEST_LIB_H
 #define GRPC_TEST_CORE_LOAD_BALANCING_LB_POLICY_TEST_LIB_H
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -48,12 +52,6 @@
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/client_channel/client_channel_internal.h"
 #include "src/core/client_channel/subchannel_interface_internal.h"
 #include "src/core/client_channel/subchannel_pool_interface.h"
diff --git a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc
index b5145f451ff..1793807fc55 100644
--- a/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc
+++ b/test/core/load_balancing/outlier_detection_lb_config_parser_test.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/load_balancing/outlier_detection_test.cc b/test/core/load_balancing/outlier_detection_test.cc
index e92c3bc4e84..d73a4ed54bf 100644
--- a/test/core/load_balancing/outlier_detection_test.cc
+++ b/test/core/load_balancing/outlier_detection_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -31,10 +33,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/test/core/load_balancing/pick_first_test.cc b/test/core/load_balancing/pick_first_test.cc
index 0f07d6fd39d..75bf64c8328 100644
--- a/test/core/load_balancing/pick_first_test.cc
+++ b/test/core/load_balancing/pick_first_test.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/load_balancing/pick_first/pick_first.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -33,10 +35,6 @@
 #include "absl/types/span.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/test/core/load_balancing/ring_hash_test.cc b/test/core/load_balancing/ring_hash_test.cc
index 0861cdcb5db..522f5794921 100644
--- a/test/core/load_balancing/ring_hash_test.cc
+++ b/test/core/load_balancing/ring_hash_test.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/load_balancing/ring_hash/ring_hash.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -30,10 +32,6 @@
 #include "absl/strings/strip.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/load_balancing/rls_lb_config_parser_test.cc b/test/core/load_balancing/rls_lb_config_parser_test.cc
index edf3e8127bf..a710284f471 100644
--- a/test/core/load_balancing/rls_lb_config_parser_test.cc
+++ b/test/core/load_balancing/rls_lb_config_parser_test.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/load_balancing/round_robin_test.cc b/test/core/load_balancing/round_robin_test.cc
index 78da9b904f3..0eb2a3ef372 100644
--- a/test/core/load_balancing/round_robin_test.cc
+++ b/test/core/load_balancing/round_robin_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <array>
 #include <memory>
 
@@ -21,9 +23,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/load_balancing/static_stride_scheduler_benchmark.cc b/test/core/load_balancing/static_stride_scheduler_benchmark.cc
index aba086e7e40..06edb74f976 100644
--- a/test/core/load_balancing/static_stride_scheduler_benchmark.cc
+++ b/test/core/load_balancing/static_stride_scheduler_benchmark.cc
@@ -14,19 +14,18 @@
 // limitations under the License.
 //
 
+#include <benchmark/benchmark.h>
+
 #include <algorithm>
 #include <atomic>
 #include <cstdint>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/algorithm/container.h"
 #include "absl/log/check.h"
 #include "absl/random/random.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-
 #include "src/core/load_balancing/weighted_round_robin/static_stride_scheduler.h"
 #include "src/core/util/no_destruct.h"
 
diff --git a/test/core/load_balancing/weighted_round_robin_config_test.cc b/test/core/load_balancing/weighted_round_robin_config_test.cc
index 5da2fb5a006..eac134bd823 100644
--- a/test/core/load_balancing/weighted_round_robin_config_test.cc
+++ b/test/core/load_balancing/weighted_round_robin_config_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/service_config/service_config.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/load_balancing/weighted_round_robin_test.cc b/test/core/load_balancing/weighted_round_robin_test.cc
index 8faa6c693e1..274d6543bf8 100644
--- a/test/core/load_balancing/weighted_round_robin_test.cc
+++ b/test/core/load_balancing/weighted_round_robin_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <inttypes.h>
 #include <stddef.h>
 
@@ -36,10 +38,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/weighted_target/weighted_target.h"
diff --git a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc
index 3407ababe59..fb14dd90c34 100644
--- a/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc
+++ b/test/core/load_balancing/xds_override_host_lb_config_parser_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/client_channel/client_channel_service_config.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/load_balancing/xds/xds_override_host.h"
diff --git a/test/core/load_balancing/xds_override_host_test.cc b/test/core/load_balancing/xds_override_host_test.cc
index 4352b6db370..e487b6ab323 100644
--- a/test/core/load_balancing/xds_override_host_test.cc
+++ b/test/core/load_balancing/xds_override_host_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -33,10 +35,6 @@
 #include "absl/types/span.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/load_balancing/lb_policy.h"
diff --git a/test/core/memory_usage/callback_client.cc b/test/core/memory_usage/callback_client.cc
index 449fcbd34fe..0f0630517ac 100644
--- a/test/core/memory_usage/callback_client.cc
+++ b/test/core/memory_usage/callback_client.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/impl/channel_arg_names.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/status.h>
 #include <limits.h>
 #include <stdio.h>
 
@@ -31,13 +36,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/impl/channel_arg_names.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/util/notification.h"
 #include "src/cpp/ext/chaotic_good.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
diff --git a/test/core/memory_usage/callback_server.cc b/test/core/memory_usage/callback_server.cc
index c630b4dc816..81a08b38725 100644
--- a/test/core/memory_usage/callback_server.cc
+++ b/test/core/memory_usage/callback_server.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/support/server_callback.h>
+#include <grpcpp/support/status.h>
+#include <grpcpp/xds_server_builder.h>
 #include <signal.h>
 #include <unistd.h>
 
@@ -26,13 +31,6 @@
 #include "absl/flags/parse.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/cpp/ext/chaotic_good.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/core/memory_usage/client.cc b/test/core/memory_usage/client.cc
index 003b108e6dd..6591f48e294 100644
--- a/test/core/memory_usage/client.cc
+++ b/test/core/memory_usage/client.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/byte_buffer_reader.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -30,18 +40,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/byte_buffer_reader.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/test/core/memory_usage/memory_usage_test.cc b/test/core/memory_usage/memory_usage_test.cc
index 798b90093da..04349e9bb10 100644
--- a/test/core/memory_usage/memory_usage_test.cc
+++ b/test/core/memory_usage/memory_usage_test.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -38,13 +43,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/wrappers.pb.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/env.h"
 #include "src/core/util/subprocess.h"
diff --git a/test/core/memory_usage/server.cc b/test/core/memory_usage/server.cc
index 4f41754d06c..294a10c95b4 100644
--- a/test/core/memory_usage/server.cc
+++ b/test/core/memory_usage/server.cc
@@ -26,17 +26,6 @@
 #include <unistd.h>
 #endif
 
-#include <algorithm>
-#include <string>
-#include <vector>
-
-#include "absl/base/attributes.h"
-#include "absl/flags/flag.h"
-#include "absl/flags/parse.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -47,6 +36,16 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "absl/base/attributes.h"
+#include "absl/flags/flag.h"
+#include "absl/flags/parse.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/message_size/message_size_service_config_test.cc b/test/core/message_size/message_size_service_config_test.cc
index 65fd3a11118..ed15404a886 100644
--- a/test/core/message_size/message_size_service_config_test.cc
+++ b/test/core/message_size/message_size_service_config_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
 #include <stddef.h>
 
 #include <memory>
@@ -21,10 +23,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-
 #include "src/core/ext/filters/message_size/message_size_filter.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc
index a952cf558dc..75b7c196536 100644
--- a/test/core/nanopb/fuzzer_response.cc
+++ b/test/core/nanopb/fuzzer_response.cc
@@ -16,11 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 #include "test/core/test_util/test_config.h"
 
 bool squelch = true;
diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc
index 278f4c4cbfa..e58e855ebe1 100644
--- a/test/core/nanopb/fuzzer_serverlist.cc
+++ b/test/core/nanopb/fuzzer_serverlist.cc
@@ -16,11 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 #include "test/core/test_util/test_config.h"
 
 bool squelch = true;
diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc
index 9211b83e7ea..44b990eb5ee 100644
--- a/test/core/network_benchmarks/low_level_ping_pong.cc
+++ b/test/core/network_benchmarks/low_level_ping_pong.cc
@@ -33,14 +33,12 @@
 #ifdef __linux__
 #include <sys/epoll.h>
 #endif
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <sys/socket.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/strerror.h"
diff --git a/test/core/promise/activity_test.cc b/test/core/promise/activity_test.cc
index eccd2c8c9bc..45edfc35eec 100644
--- a/test/core/promise/activity_test.cc
+++ b/test/core/promise/activity_test.cc
@@ -22,7 +22,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/test/core/promise/arena_promise_test.cc b/test/core/promise/arena_promise_test.cc
index 2f4da3b2c5d..f51d26f114d 100644
--- a/test/core/promise/arena_promise_test.cc
+++ b/test/core/promise/arena_promise_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/promise/arena_promise.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <array>
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/promise/bm_party.cc b/test/core/promise/bm_party.cc
index c271a4d240a..c6976e62a19 100644
--- a/test/core/promise/bm_party.cc
+++ b/test/core/promise/bm_party.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/promise/cancel_callback_test.cc b/test/core/promise/cancel_callback_test.cc
index 64ca6d0a8ce..3a674a009f6 100644
--- a/test/core/promise/cancel_callback_test.cc
+++ b/test/core/promise/cancel_callback_test.cc
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/event_engine_wakeup_scheduler_test.cc b/test/core/promise/event_engine_wakeup_scheduler_test.cc
index 739c1a25f4e..4972de90245 100644
--- a/test/core/promise/event_engine_wakeup_scheduler_test.cc
+++ b/test/core/promise/event_engine_wakeup_scheduler_test.cc
@@ -14,16 +14,14 @@
 
 #include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
 #include <stdlib.h>
 
 #include <memory>
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
index 27d1c49bdb6..d7fb2449bc1 100644
--- a/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
+++ b/test/core/promise/exec_ctx_wakeup_scheduler_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/poll.h"
 
diff --git a/test/core/promise/for_each_test.cc b/test/core/promise/for_each_test.cc
index ea0f63732c1..c1863b6e4ea 100644
--- a/test/core/promise/for_each_test.cc
+++ b/test/core/promise/for_each_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/lib/promise/for_each.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/inter_activity_pipe.h"
 #include "src/core/lib/promise/join.h"
diff --git a/test/core/promise/inter_activity_latch_test.cc b/test/core/promise/inter_activity_latch_test.cc
index 925062c561b..d71ce40cae5 100644
--- a/test/core/promise/inter_activity_latch_test.cc
+++ b/test/core/promise/inter_activity_latch_test.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/lib/promise/inter_activity_latch.h"
 
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
 #include "src/core/lib/promise/seq.h"
diff --git a/test/core/promise/inter_activity_pipe_test.cc b/test/core/promise/inter_activity_pipe_test.cc
index a81ac5c1822..6493ff35b2d 100644
--- a/test/core/promise/inter_activity_pipe_test.cc
+++ b/test/core/promise/inter_activity_pipe_test.cc
@@ -18,7 +18,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/seq.h"
 #include "test/core/promise/test_wakeup_schedulers.h"
 
diff --git a/test/core/promise/interceptor_list_test.cc b/test/core/promise/interceptor_list_test.cc
index d52ba611006..6797c4dfe5a 100644
--- a/test/core/promise/interceptor_list_test.cc
+++ b/test/core/promise/interceptor_list_test.cc
@@ -14,12 +14,11 @@
 
 #include "src/core/lib/promise/interceptor_list.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/promise/join_test.cc b/test/core/promise/join_test.cc
index 7e60d65732f..2fd6b21dc96 100644
--- a/test/core/promise/join_test.cc
+++ b/test/core/promise/join_test.cc
@@ -19,7 +19,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 #include "test/core/promise/poll_matcher.h"
 
diff --git a/test/core/promise/latch_test.cc b/test/core/promise/latch_test.cc
index b1af24bd4bf..8fef26a0d40 100644
--- a/test/core/promise/latch_test.cc
+++ b/test/core/promise/latch_test.cc
@@ -20,7 +20,6 @@
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/seq.h"
diff --git a/test/core/promise/loop_test.cc b/test/core/promise/loop_test.cc
index 42362327915..7ec3a1060ef 100644
--- a/test/core/promise/loop_test.cc
+++ b/test/core/promise/loop_test.cc
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/seq.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/map_pipe_test.cc b/test/core/promise/map_pipe_test.cc
index 5b702f2f8d0..5f891a36191 100644
--- a/test/core/promise/map_pipe_test.cc
+++ b/test/core/promise/map_pipe_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/promise/map_pipe.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <memory>
 #include <utility>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/for_each.h"
 #include "src/core/lib/promise/join.h"
diff --git a/test/core/promise/map_test.cc b/test/core/promise/map_test.cc
index 85697084084..cd6f373f3fe 100644
--- a/test/core/promise/map_test.cc
+++ b/test/core/promise/map_test.cc
@@ -18,7 +18,6 @@
 
 #include "absl/functional/any_invocable.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/promise.h"
 #include "test/core/promise/poll_matcher.h"
 
diff --git a/test/core/promise/mpsc_test.cc b/test/core/promise/mpsc_test.cc
index 0a486edff72..fd852b088de 100644
--- a/test/core/promise/mpsc_test.cc
+++ b/test/core/promise/mpsc_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/lib/promise/mpsc.h"
 
+#include <grpc/support/log.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/log.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/promise.h"
 #include "test/core/promise/poll_matcher.h"
diff --git a/test/core/promise/observable_test.cc b/test/core/promise/observable_test.cc
index 45fb438ebd1..8de6dd56812 100644
--- a/test/core/promise/observable_test.cc
+++ b/test/core/promise/observable_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/promise/observable.h"
 
+#include <grpc/support/log.h>
+
 #include <cstdint>
 #include <limits>
 #include <thread>
@@ -22,9 +24,6 @@
 #include "absl/strings/str_join.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/log.h>
-
 #include "src/core/lib/promise/loop.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc
index 09075395bf4..540163333fa 100644
--- a/test/core/promise/party_test.cc
+++ b/test/core/promise/party_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/promise/party.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
 #include <stdio.h>
 
 #include <algorithm>
@@ -25,11 +28,6 @@
 #include "absl/base/thread_annotations.h"
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/promise/pipe_test.cc b/test/core/promise/pipe_test.cc
index b74f29df2e8..d1cffb08d97 100644
--- a/test/core/promise/pipe_test.cc
+++ b/test/core/promise/pipe_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/promise/pipe.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+
 #include <memory>
 #include <tuple>
 #include <utility>
@@ -22,10 +25,6 @@
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/map.h"
diff --git a/test/core/promise/prioritized_race_test.cc b/test/core/promise/prioritized_race_test.cc
index c663fe041d0..53bc0830719 100644
--- a/test/core/promise/prioritized_race_test.cc
+++ b/test/core/promise/prioritized_race_test.cc
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/promise_factory_test.cc b/test/core/promise/promise_factory_test.cc
index 3690d78e5cc..f6418c3ed47 100644
--- a/test/core/promise/promise_factory_test.cc
+++ b/test/core/promise/promise_factory_test.cc
@@ -16,7 +16,6 @@
 
 #include "absl/functional/bind_front.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/promise_fuzzer.cc b/test/core/promise/promise_fuzzer.cc
index 0b70153d023..28214f96f4b 100644
--- a/test/core/promise/promise_fuzzer.cc
+++ b/test/core/promise/promise_fuzzer.cc
@@ -23,7 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/map.h"
diff --git a/test/core/promise/promise_mutex_test.cc b/test/core/promise/promise_mutex_test.cc
index 9ef2c778d65..8bbadd03925 100644
--- a/test/core/promise/promise_mutex_test.cc
+++ b/test/core/promise/promise_mutex_test.cc
@@ -19,7 +19,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/promise.h"
diff --git a/test/core/promise/race_test.cc b/test/core/promise/race_test.cc
index 16fbdb13d0a..4369fa81472 100644
--- a/test/core/promise/race_test.cc
+++ b/test/core/promise/race_test.cc
@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/poll.h"
 
 namespace grpc_core {
diff --git a/test/core/promise/sleep_test.cc b/test/core/promise/sleep_test.cc
index eaa816294da..842320d4eff 100644
--- a/test/core/promise/sleep_test.cc
+++ b/test/core/promise/sleep_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/promise/sleep.h"
 
+#include <grpc/grpc.h>
+
 #include <chrono>
 #include <cstddef>
 #include <memory>
@@ -23,9 +25,6 @@
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/promise/try_seq_metadata_test.cc b/test/core/promise/try_seq_metadata_test.cc
index 34c74a83211..1f8c583a810 100644
--- a/test/core/promise/try_seq_metadata_test.cc
+++ b/test/core/promise/try_seq_metadata_test.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/status.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/promise/poll.h"
 #include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/transport/metadata_batch.h"
diff --git a/test/core/promise/wait_for_callback_test.cc b/test/core/promise/wait_for_callback_test.cc
index 25f5771379c..f710717ba78 100644
--- a/test/core/promise/wait_for_callback_test.cc
+++ b/test/core/promise/wait_for_callback_test.cc
@@ -16,7 +16,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/promise/map.h"
 #include "src/core/util/notification.h"
 #include "test/core/promise/test_wakeup_schedulers.h"
diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc
index 7f6d3b9f14c..fa8430fb11f 100644
--- a/test/core/resolver/binder_resolver_test.cc
+++ b/test/core/resolver/binder_resolver_test.cc
@@ -20,7 +20,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolved_address.h"
@@ -43,10 +42,9 @@
 #include <sys/un.h>
 #endif  // GPR_WINDOWS
 
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/resolver/resolver_registry.h"
 
diff --git a/test/core/resolver/dns_resolver_cooldown_test.cc b/test/core/resolver/dns_resolver_cooldown_test.cc
index ad7b6a3a8c3..8682a1b2553 100644
--- a/test/core/resolver/dns_resolver_cooldown_test.cc
+++ b/test/core/resolver/dns_resolver_cooldown_test.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -29,15 +36,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/resolver/dns_resolver_test.cc b/test/core/resolver/dns_resolver_test.cc
index 4bf8a069c8b..9a80fbc2787 100644
--- a/test/core/resolver/dns_resolver_test.cc
+++ b/test/core/resolver/dns_resolver_test.cc
@@ -25,7 +25,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/resolver/endpoint_addresses_test.cc b/test/core/resolver/endpoint_addresses_test.cc
index dafb5a54aac..1d2c848aea2 100644
--- a/test/core/resolver/endpoint_addresses_test.cc
+++ b/test/core/resolver/endpoint_addresses_test.cc
@@ -16,6 +16,8 @@
 
 #include "src/core/resolver/endpoint_addresses.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 
 #include "absl/log/check.h"
@@ -23,9 +25,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/resolver/fake_resolver_test.cc b/test/core/resolver/fake_resolver_test.cc
index 9b14b43d431..2f4b7621b39 100644
--- a/test/core/resolver/fake_resolver_test.cc
+++ b/test/core/resolver/fake_resolver_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/resolver/fake/fake_resolver.h"
 
+#include <grpc/grpc.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -34,9 +35,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/notification.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/resolver/google_c2p_resolver_test.cc b/test/core/resolver/google_c2p_resolver_test.cc
index 96ddc587c4e..52e9d57b5ae 100644
--- a/test/core/resolver/google_c2p_resolver_test.cc
+++ b/test/core/resolver/google_c2p_resolver_test.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -25,13 +30,6 @@
 
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/util/env.h"
 #include "test/core/test_util/fake_udp_and_tcp_server.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/resolver/sockaddr_resolver_test.cc b/test/core/resolver/sockaddr_resolver_test.cc
index faf90400364..94559aca191 100644
--- a/test/core/resolver/sockaddr_resolver_test.cc
+++ b/test/core/resolver/sockaddr_resolver_test.cc
@@ -24,7 +24,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/resource_quota/arena_test.cc b/test/core/resource_quota/arena_test.cc
index 997b7760d22..bac5cf13e6e 100644
--- a/test/core/resource_quota/arena_test.cc
+++ b/test/core/resource_quota/arena_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/resource_quota/arena.h"
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -31,10 +33,6 @@
 #include "absl/strings/str_join.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/resource_quota/memory_quota_fuzzer.cc b/test/core/resource_quota/memory_quota_fuzzer.cc
index 654f20e291a..a3296fb43fb 100644
--- a/test/core/resource_quota/memory_quota_fuzzer.cc
+++ b/test/core/resource_quota/memory_quota_fuzzer.cc
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/support/log.h>
 #include <stdint.h>
 #include <sys/types.h>
 
@@ -24,11 +27,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/closure.h"
diff --git a/test/core/resource_quota/memory_quota_stress_test.cc b/test/core/resource_quota/memory_quota_stress_test.cc
index a8086810cc7..eb8c66127d3 100644
--- a/test/core/resource_quota/memory_quota_stress_test.cc
+++ b/test/core/resource_quota/memory_quota_stress_test.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/memory_request.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -29,10 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/memory_request.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/resource_quota/memory_quota_test.cc b/test/core/resource_quota/memory_quota_test.cc
index 245fe892c97..31993f03377 100644
--- a/test/core/resource_quota/memory_quota_test.cc
+++ b/test/core/resource_quota/memory_quota_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/resource_quota/memory_quota.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/log.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -23,10 +26,6 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/resource_quota/call_checker.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/resource_quota/periodic_update_test.cc b/test/core/resource_quota/periodic_update_test.cc
index 90d98913693..4ae6709e18d 100644
--- a/test/core/resource_quota/periodic_update_test.cc
+++ b/test/core/resource_quota/periodic_update_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/resource_quota/periodic_update.h"
 
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -21,10 +23,6 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 
 namespace grpc_core {
diff --git a/test/core/resource_quota/resource_quota_test.cc b/test/core/resource_quota/resource_quota_test.cc
index 3ea0046f773..c0dfd8da44e 100644
--- a/test/core/resource_quota/resource_quota_test.cc
+++ b/test/core/resource_quota/resource_quota_test.cc
@@ -15,7 +15,6 @@
 #include "src/core/lib/resource_quota/resource_quota.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/security/alts_credentials_fuzzer.cc b/test/core/security/alts_credentials_fuzzer.cc
index 9f76b2bf738..80d2a065a86 100644
--- a/test/core/security/alts_credentials_fuzzer.cc
+++ b/test/core/security/alts_credentials_fuzzer.cc
@@ -16,16 +16,14 @@
 //
 //
 
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/security/credentials/alts/alts_credentials.h"
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
diff --git a/test/core/security/alts_security_connector_test.cc b/test/core/security/alts_security_connector_test.cc
index 02a7cf5e1a4..f215eee5a78 100644
--- a/test/core/security/alts_security_connector_test.cc
+++ b/test/core/security/alts_security_connector_test.cc
@@ -18,17 +18,14 @@
 
 #include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
diff --git a/test/core/security/auth_context_test.cc b/test/core/security/auth_context_test.cc
index 9443712cc91..64efbb79590 100644
--- a/test/core/security/auth_context_test.cc
+++ b/test/core/security/auth_context_test.cc
@@ -16,12 +16,10 @@
 //
 //
 
-#include <string.h>
-
 #include <gtest/gtest.h>
+#include <string.h>
 
 #include "absl/log/log.h"
-
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/security/authorization_matchers_test.cc b/test/core/security/authorization_matchers_test.cc
index 3ce899e2a36..9cc15c665be 100644
--- a/test/core/security/authorization_matchers_test.cc
+++ b/test/core/security/authorization_matchers_test.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <list>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
+#include <list>
 
 #include "src/core/lib/security/authorization/evaluate_args.h"
 #include "src/core/lib/security/authorization/matchers.h"
diff --git a/test/core/security/aws_request_signer_test.cc b/test/core/security/aws_request_signer_test.cc
index 89c2d962ee7..11d93f5580d 100644
--- a/test/core/security/aws_request_signer_test.cc
+++ b/test/core/security/aws_request_signer_test.cc
@@ -17,11 +17,9 @@
 #include "src/core/lib/security/credentials/external/aws_request_signer.h"
 
 #include <gmock/gmock.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc_security.h>
 
+#include "absl/log/check.h"
 #include "test/core/test_util/test_config.h"
 
 namespace testing {
diff --git a/test/core/security/certificate_provider_registry_test.cc b/test/core/security/certificate_provider_registry_test.cc
index cca80deeb35..f4f1b48aa08 100644
--- a/test/core/security/certificate_provider_registry_test.cc
+++ b/test/core/security/certificate_provider_registry_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
 #include <gmock/gmock.h>
-
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
diff --git a/test/core/security/channel_creds_registry_test.cc b/test/core/security/channel_creds_registry_test.cc
index 399e26a58ea..f2a207ce439 100644
--- a/test/core/security/channel_creds_registry_test.cc
+++ b/test/core/security/channel_creds_registry_test.cc
@@ -19,12 +19,10 @@
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
 
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/credentials/composite/composite_credentials.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
diff --git a/test/core/security/check_gcp_environment_linux_test.cc b/test/core/security/check_gcp_environment_linux_test.cc
index b4122a8051e..2730ca757fe 100644
--- a/test/core/security/check_gcp_environment_linux_test.cc
+++ b/test/core/security/check_gcp_environment_linux_test.cc
@@ -16,13 +16,11 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/check_gcp_environment_windows_test.cc b/test/core/security/check_gcp_environment_windows_test.cc
index 7d1db40d69f..7659144350a 100644
--- a/test/core/security/check_gcp_environment_windows_test.cc
+++ b/test/core/security/check_gcp_environment_windows_test.cc
@@ -16,13 +16,11 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/create_jwt.cc b/test/core/security/create_jwt.cc
index f4f84a4ff4b..7d6c1188557 100644
--- a/test/core/security/create_jwt.cc
+++ b/test/core/security/create_jwt.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
 #include <grpc/credentials.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/credentials/jwt/jwt_credentials.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/credentials_test.cc b/test/core/security/credentials_test.cc
index da207a6474b..f075bb32f91 100644
--- a/test/core/security/credentials_test.cc
+++ b/test/core/security/credentials_test.cc
@@ -18,29 +18,26 @@
 
 #include "src/core/lib/security/credentials/credentials.h"
 
+#include <gmock/gmock.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <openssl/rsa.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <string>
 
-#include <gmock/gmock.h>
-#include <openssl/rsa.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_replace.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/security/evaluate_args_test.cc b/test/core/security/evaluate_args_test.cc
index 0599416a898..91c954b0406 100644
--- a/test/core/security/evaluate_args_test.cc
+++ b/test/core/security/evaluate_args_test.cc
@@ -15,9 +15,8 @@
 #include "src/core/lib/security/authorization/evaluate_args.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "test/core/test_util/evaluate_args_test_util.h"
diff --git a/test/core/security/fetch_oauth2.cc b/test/core/security/fetch_oauth2.cc
index b99d41f9dce..35c34eb3ef8 100644
--- a/test/core/security/fetch_oauth2.cc
+++ b/test/core/security/fetch_oauth2.cc
@@ -16,12 +16,6 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -29,7 +23,11 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
 #include <grpcpp/security/credentials.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/util/json_util.h"
diff --git a/test/core/security/grpc_alts_credentials_options_test.cc b/test/core/security/grpc_alts_credentials_options_test.cc
index 77f41ef7a8d..7884aa87885 100644
--- a/test/core/security/grpc_alts_credentials_options_test.cc
+++ b/test/core/security/grpc_alts_credentials_options_test.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
 
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/crash.h"
 
 #define ALTS_CLIENT_OPTIONS_TEST_TARGET_SERVICE_ACCOUNT_1 "abc@google.com"
diff --git a/test/core/security/grpc_audit_logging_test.cc b/test/core/security/grpc_audit_logging_test.cc
index 415a6089fa9..d6113a68e91 100644
--- a/test/core/security/grpc_audit_logging_test.cc
+++ b/test/core/security/grpc_audit_logging_test.cc
@@ -16,21 +16,19 @@
 //
 //
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/numbers.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/test/core/security/grpc_authorization_engine_test.cc b/test/core/security/grpc_authorization_engine_test.cc
index 03f6b7d6a0d..4535c9c1287 100644
--- a/test/core/security/grpc_authorization_engine_test.cc
+++ b/test/core/security/grpc_authorization_engine_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_audit_logging.h>
 #include <grpc/grpc_security_constants.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/security/grpc_authorization_policy_provider_test.cc b/test/core/security/grpc_authorization_policy_provider_test.cc
index bf1c6d81a28..0af5f2db8c3 100644
--- a/test/core/security/grpc_authorization_policy_provider_test.cc
+++ b/test/core/security/grpc_authorization_policy_provider_test.cc
@@ -15,10 +15,9 @@
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/authorization/grpc_authorization_engine.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/security/grpc_tls_certificate_distributor_test.cc b/test/core/security/grpc_tls_certificate_distributor_test.cc
index c3459b22370..374969aeca1 100644
--- a/test/core/security/grpc_tls_certificate_distributor_test.cc
+++ b/test/core/security/grpc_tls_certificate_distributor_test.cc
@@ -16,19 +16,17 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 
+#include <gmock/gmock.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+
 #include <deque>
 #include <list>
 #include <string>
 #include <thread>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/security/grpc_tls_certificate_provider_test.cc b/test/core/security/grpc_tls_certificate_provider_test.cc
index d0ce58ecafb..32f47d44d0c 100644
--- a/test/core/security/grpc_tls_certificate_provider_test.cc
+++ b/test/core/security/grpc_tls_certificate_provider_test.cc
@@ -16,18 +16,16 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
-#include <deque>
-#include <list>
-
 #include <gmock/gmock.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <gtest/gtest.h>
 
+#include <deque>
+#include <list>
+
 #include "absl/log/check.h"
 #include "absl/status/status.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/tmpfile.h"
diff --git a/test/core/security/grpc_tls_certificate_verifier_test.cc b/test/core/security/grpc_tls_certificate_verifier_test.cc
index 162c2e3c367..deafd044262 100644
--- a/test/core/security/grpc_tls_certificate_verifier_test.cc
+++ b/test/core/security/grpc_tls_certificate_verifier_test.cc
@@ -16,17 +16,15 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h"
 
-#include <deque>
-#include <list>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+
+#include <deque>
+#include <list>
 
+#include "absl/log/log.h"
 #include "src/core/lib/security/security_connector/tls/tls_security_connector.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/grpc_tls_credentials_options_test.cc b/test/core/security/grpc_tls_credentials_options_test.cc
index 8e2784c77d6..9064a430e0a 100644
--- a/test/core/security/grpc_tls_credentials_options_test.cc
+++ b/test/core/security/grpc_tls_credentials_options_test.cc
@@ -19,12 +19,11 @@
 #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/security/credentials/tls/tls_credentials.h"
diff --git a/test/core/security/grpc_tls_crl_provider_test.cc b/test/core/security/grpc_tls_crl_provider_test.cc
index d8bb630005d..6331283effb 100644
--- a/test/core/security/grpc_tls_crl_provider_test.cc
+++ b/test/core/security/grpc_tls_crl_provider_test.cc
@@ -18,23 +18,21 @@
 
 #include "src/core/lib/security/credentials/tls/grpc_tls_crl_provider.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/grpc_crl_provider.h>
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <cstdlib>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/grpc_crl_provider.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "test/core/event_engine/event_engine_test_utils.h"
diff --git a/test/core/security/insecure_security_connector_test.cc b/test/core/security/insecure_security_connector_test.cc
index 31b175889e0..598ed8c5a83 100644
--- a/test/core/security/insecure_security_connector_test.cc
+++ b/test/core/security/insecure_security_connector_test.cc
@@ -19,9 +19,8 @@
 #include "src/core/lib/security/security_connector/insecure/insecure_security_connector.h"
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/test/core/security/json_token_test.cc b/test/core/security/json_token_test.cc
index 03569c4d1b5..f66bd7cb9e7 100644
--- a/test/core/security/json_token_test.cc
+++ b/test/core/security/json_token_test.cc
@@ -18,19 +18,16 @@
 
 #include "src/core/lib/security/credentials/jwt/json_token.h"
 
-#include <string.h>
-
-#include <gtest/gtest.h>
-#include <openssl/evp.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/escaping.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <openssl/evp.h>
+#include <string.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/escaping.h"
 #include "src/core/lib/security/credentials/oauth2/oauth2_credentials.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/security/jwt_verifier_test.cc b/test/core/security/jwt_verifier_test.cc
index 448dd57e7fc..7510ab738b7 100644
--- a/test/core/security/jwt_verifier_test.cc
+++ b/test/core/security/jwt_verifier_test.cc
@@ -18,17 +18,14 @@
 
 #include "src/core/lib/security/credentials/jwt/jwt_verifier.h"
 
-#include <string.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/strings/escaping.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <string.h>
 
+#include "absl/strings/escaping.h"
 #include "src/core/lib/security/credentials/jwt/json_token.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/http_client/httpcli.h"
diff --git a/test/core/security/local_security_connector_test.cc b/test/core/security/local_security_connector_test.cc
index 0470cd3bc1d..3975e148a6c 100644
--- a/test/core/security/local_security_connector_test.cc
+++ b/test/core/security/local_security_connector_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/impl/grpc_types.h>
+#include <gtest/gtest.h>
 
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/security/context/security_context.h"
diff --git a/test/core/security/oauth2_utils.cc b/test/core/security/oauth2_utils.cc
index 6111bb25e61..66bd0968811 100644
--- a/test/core/security/oauth2_utils.cc
+++ b/test/core/security/oauth2_utils.cc
@@ -18,10 +18,6 @@
 
 #include "test/core/security/oauth2_utils.h"
 
-#include <string.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
@@ -29,7 +25,9 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/exec_ctx_wakeup_scheduler.h"
 #include "src/core/lib/promise/map.h"
diff --git a/test/core/security/print_google_default_creds_token.cc b/test/core/security/print_google_default_creds_token.cc
index 1d715fe18cd..dc6e10aa4d8 100644
--- a/test/core/security/print_google_default_creds_token.cc
+++ b/test/core/security/print_google_default_creds_token.cc
@@ -16,18 +16,16 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/security/credentials/composite/composite_credentials.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
diff --git a/test/core/security/rbac_translator_test.cc b/test/core/security/rbac_translator_test.cc
index 0d7a798da34..156696637af 100644
--- a/test/core/security/rbac_translator_test.cc
+++ b/test/core/security/rbac_translator_test.cc
@@ -14,16 +14,14 @@
 
 #include "src/core/lib/security/authorization/rbac_translator.h"
 
-#include <memory>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc_audit_logging.h>
 #include <gtest/gtest.h>
 
+#include <memory>
+
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc
index 6f4cd318820..c220ede196d 100644
--- a/test/core/security/secure_endpoint_test.cc
+++ b/test/core/security/secure_endpoint_test.cc
@@ -19,15 +19,12 @@
 #include "src/core/handshaker/security/secure_endpoint.h"
 
 #include <fcntl.h>
-#include <sys/types.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <sys/types.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/lib/slice/slice_internal.h"
diff --git a/test/core/security/security_connector_test.cc b/test/core/security/security_connector_test.cc
index dfccc4b7abe..2716441b900 100644
--- a/test/core/security/security_connector_test.cc
+++ b/test/core/security/security_connector_test.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/lib/security/security_connector/security_connector.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/log.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/test/core/security/ssl_credentials_test.cc b/test/core/security/ssl_credentials_test.cc
index 8e63303c8b8..49171f6c4c5 100644
--- a/test/core/security/ssl_credentials_test.cc
+++ b/test/core/security/ssl_credentials_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/security/credentials/ssl/ssl_credentials.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/tsi/ssl_transport_security.h"
diff --git a/test/core/security/ssl_server_fuzzer.cc b/test/core/security/ssl_server_fuzzer.cc
index 7ca9762c124..09c170fc44a 100644
--- a/test/core/security/ssl_server_fuzzer.cc
+++ b/test/core/security/ssl_server_fuzzer.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include "absl/log/check.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/credentials.h>
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 
+#include "absl/log/check.h"
+#include "absl/synchronization/notification.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/security/security_connector/security_connector.h"
diff --git a/test/core/security/system_roots_test.cc b/test/core/security/system_roots_test.cc
index 9d94185edfb..c5c840085da 100644
--- a/test/core/security/system_roots_test.cc
+++ b/test/core/security/system_roots_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <stdio.h>
-
 #include <grpc/support/port_platform.h>
+#include <stdio.h>
 
 #if defined(GPR_LINUX) || defined(GPR_FREEBSD) || defined(GPR_APPLE) || \
     defined(GPR_WINDOWS)
@@ -27,12 +26,11 @@
 #include <sys/param.h>
 #endif  // GPR_LINUX || GPR_FREEBSD || GPR_APPLE
 
-#include "gtest/gtest.h"
-
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 
+#include "gtest/gtest.h"
 #include "src/core/lib/security/context/security_context.h"
 #include "src/core/lib/security/security_connector/load_system_roots.h"
 #include "src/core/lib/security/security_connector/load_system_roots_supported.h"
diff --git a/test/core/security/tls_security_connector_test.cc b/test/core/security/tls_security_connector_test.cc
index b2e933d6d16..16a498f6097 100644
--- a/test/core/security/tls_security_connector_test.cc
+++ b/test/core/security/tls_security_connector_test.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/lib/security/security_connector/tls/tls_security_connector.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/credentials.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/security/context/security_context.h"
diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc
index b330c0dbf33..e977f2a8e06 100644
--- a/test/core/security/verify_jwt.cc
+++ b/test/core/security/verify_jwt.cc
@@ -16,17 +16,15 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/sync.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/security/credentials/jwt/jwt_verifier.h"
diff --git a/test/core/security/xds_credentials_test.cc b/test/core/security/xds_credentials_test.cc
index 2d485f8f733..5434720e55d 100644
--- a/test/core/security/xds_credentials_test.cc
+++ b/test/core/security/xds_credentials_test.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/lib/security/credentials/xds/xds_credentials.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/server/server_config_selector_test.cc b/test/core/server/server_config_selector_test.cc
index 3bdf5a7dca0..3a023239285 100644
--- a/test/core/server/server_config_selector_test.cc
+++ b/test/core/server/server_config_selector_test.cc
@@ -18,11 +18,10 @@
 
 #include "src/core/server/server_config_selector.h"
 
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/server/xds_channel_stack_modifier_test.cc b/test/core/server/xds_channel_stack_modifier_test.cc
index 16f0e6e4e81..07569b8b93c 100644
--- a/test/core/server/xds_channel_stack_modifier_test.cc
+++ b/test/core/server/xds_channel_stack_modifier_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/server/xds_channel_stack_modifier.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <string>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
diff --git a/test/core/service_config/service_config_test.cc b/test/core/service_config/service_config_test.cc
index 24112d7732f..26a381084f9 100644
--- a/test/core/service_config/service_config_test.cc
+++ b/test/core/service_config/service_config_test.cc
@@ -16,6 +16,7 @@
 
 #include "src/core/service_config/service_config.h"
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 
 #include <memory>
@@ -27,9 +28,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/service_config/service_config_impl.h"
diff --git a/test/core/slice/c_slice_buffer_test.cc b/test/core/slice/c_slice_buffer_test.cc
index 2f2edb50dcf..105d96afd70 100644
--- a/test/core/slice/c_slice_buffer_test.cc
+++ b/test/core/slice/c_slice_buffer_test.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <stddef.h>
-
-#include "gtest/gtest.h"
-
 #include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
+#include <stddef.h>
 
+#include "gtest/gtest.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc
index 9124c042434..e7f3f4e15de 100644
--- a/test/core/slice/percent_decode_fuzzer.cc
+++ b/test/core/slice/percent_decode_fuzzer.cc
@@ -16,11 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc
index 6deef7b8786..e6d10da820c 100644
--- a/test/core/slice/percent_encode_fuzzer.cc
+++ b/test/core/slice/percent_encode_fuzzer.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/slice/percent_encoding.h"
 #include "src/core/lib/slice/slice.h"
 
diff --git a/test/core/slice/percent_encoding_test.cc b/test/core/slice/percent_encoding_test.cc
index 6d3534e539e..8ed0eac045c 100644
--- a/test/core/slice/percent_encoding_test.cc
+++ b/test/core/slice/percent_encoding_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/lib/slice/percent_encoding.h"
 
+#include <grpc/support/alloc.h>
 #include <stddef.h>
 
 #include <memory>
@@ -25,9 +26,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc
index 08bcf0429b7..f2f3dc42293 100644
--- a/test/core/slice/slice_buffer_test.cc
+++ b/test/core/slice/slice_buffer_test.cc
@@ -14,6 +14,9 @@
 
 #include "src/core/lib/slice/slice_buffer.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <string.h>
 
 #include <memory>
@@ -21,11 +24,6 @@
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice.h"
 
 using ::grpc_core::Slice;
diff --git a/test/core/slice/slice_string_helpers_test.cc b/test/core/slice/slice_string_helpers_test.cc
index a158a382221..ed4dfa62b99 100644
--- a/test/core/slice/slice_string_helpers_test.cc
+++ b/test/core/slice/slice_string_helpers_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/lib/slice/slice_string_helpers.h"
 
+#include <grpc/support/alloc.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/string.h"
 
 static void expect_slice_dump(grpc_slice slice, uint32_t flags,
diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc
index 1503e11abc7..734ece4db83 100644
--- a/test/core/slice/slice_test.cc
+++ b/test/core/slice/slice_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/slice/slice.h"
 
+#include <grpc/slice.h>
+#include <grpc/support/port_platform.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -31,10 +33,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_refcount.h"
 #include "src/core/util/memory.h"
diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc
index 0f0ba7cec07..7dd5da279b4 100644
--- a/test/core/surface/byte_buffer_reader_test.cc
+++ b/test/core/surface/byte_buffer_reader_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <string.h>
-
-#include <memory>
-
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/compression.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
+#include <string.h>
+
+#include <memory>
 
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 TEST(GrpcByteBufferReaderTest, TestReadOneSlice) {
diff --git a/test/core/surface/channel_init_test.cc b/test/core/surface/channel_init_test.cc
index 29eadfed9a4..334a87e83d0 100644
--- a/test/core/surface/channel_init_test.cc
+++ b/test/core/surface/channel_init_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channel_stack_builder_impl.h"
 #include "src/core/lib/channel/promise_based_filter.h"
diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc
index 9175196fa1a..2ded6ce64bf 100644
--- a/test/core/surface/completion_queue_test.cc
+++ b/test/core/surface/completion_queue_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/lib/surface/completion_queue.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -25,11 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc
index 3d6dbd1fc97..f9a95f1d56b 100644
--- a/test/core/surface/completion_queue_threading_test.cc
+++ b/test/core/surface/completion_queue_threading_test.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -24,12 +28,6 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc
index 329dd0ef286..ff6edf5d877 100644
--- a/test/core/surface/concurrent_connectivity_test.cc
+++ b/test/core/surface/concurrent_connectivity_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -26,14 +32,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc
index 58d0347a2bb..bff6d0564f6 100644
--- a/test/core/surface/init_test.cc
+++ b/test/core/surface/init_test.cc
@@ -18,16 +18,15 @@
 
 #include "src/core/lib/surface/init.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+
 #include <chrono>
 #include <memory>
 
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/thd.h"
diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc
index c81f2492c2b..f2fb59585a7 100644
--- a/test/core/surface/lame_client_test.cc
+++ b/test/core/surface/lame_client_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <string.h>
-
-#include <memory>
-
-#include "absl/status/status.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/propagation_bits.h>
 #include <grpc/slice.h>
 #include <grpc/status.h>
 #include <grpc/support/alloc.h>
+#include <string.h>
+
+#include <memory>
 
+#include "absl/status/status.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/experiments/experiments.h"
diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc
index 8eeb546e35b..f718ccef780 100644
--- a/test/core/surface/num_external_connectivity_watchers_test.cc
+++ b/test/core/surface/num_external_connectivity_watchers_test.cc
@@ -16,20 +16,18 @@
 //
 //
 
-#include <stddef.h>
-
-#include <string>
-
-#include "absl/log/log.h"
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 #include <grpc/support/time.h>
+#include <stddef.h>
+
+#include <string>
 
+#include "absl/log/log.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc
index baa1e8d05d1..54f2ece9629 100644
--- a/test/core/surface/secure_channel_create_test.cc
+++ b/test/core/surface/secure_channel_create_test.cc
@@ -15,12 +15,11 @@
 //
 //
 
+#include <grpc/grpc.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc
index ab6dfe4b1a6..e6467316c96 100644
--- a/test/core/surface/sequential_connectivity_test.cc
+++ b/test/core/surface/sequential_connectivity_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -24,14 +30,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc
index 359af60ff28..214175f7a0c 100644
--- a/test/core/surface/server_chttp2_test.cc
+++ b/test/core/surface/server_chttp2_test.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <string>
-
-#include "gtest/gtest.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/support/time.h>
 
+#include <string>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc
index ec58b556a7f..67600a4ddf5 100644
--- a/test/core/surface/server_test.cc
+++ b/test/core/surface/server_test.cc
@@ -16,6 +16,11 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -26,13 +31,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
diff --git a/test/core/telemetry/call_tracer_test.cc b/test/core/telemetry/call_tracer_test.cc
index 688a5114156..fbc8892485b 100644
--- a/test/core/telemetry/call_tracer_test.cc
+++ b/test/core/telemetry/call_tracer_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/telemetry/call_tracer.h"
 
-#include <vector>
-
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/memory_allocator.h>
 #include <grpc/grpc.h>
 
+#include <vector>
+
+#include "gtest/gtest.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/telemetry/metrics_test.cc b/test/core/telemetry/metrics_test.cc
index 8c492cb698f..ad139096e14 100644
--- a/test/core/telemetry/metrics_test.cc
+++ b/test/core/telemetry/metrics_test.cc
@@ -19,7 +19,6 @@
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "test/core/test_util/fake_stats_plugin.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/telemetry/stats_test.cc b/test/core/telemetry/stats_test.cc
index 8f6a2f10960..9655d50eec1 100644
--- a/test/core/telemetry/stats_test.cc
+++ b/test/core/telemetry/stats_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/telemetry/stats.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/telemetry/stats_data.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/telemetry/trace_flags_test.cc b/test/core/telemetry/trace_flags_test.cc
index 06472794ba7..b23ccf3d7fb 100644
--- a/test/core/telemetry/trace_flags_test.cc
+++ b/test/core/telemetry/trace_flags_test.cc
@@ -12,11 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/strings/match.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/strings/match.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/debug/trace.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/test_util/audit_logging_utils.cc b/test/core/test_util/audit_logging_utils.cc
index 492cbb3312d..a4ff7768345 100644
--- a/test/core/test_util/audit_logging_utils.cc
+++ b/test/core/test_util/audit_logging_utils.cc
@@ -16,6 +16,10 @@
 
 #include "test/core/test_util/audit_logging_utils.h"
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -23,11 +27,6 @@
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/json/json_writer.h"
 
 namespace grpc_core {
diff --git a/test/core/test_util/audit_logging_utils.h b/test/core/test_util/audit_logging_utils.h
index 6e46119bc36..4c119e11412 100644
--- a/test/core/test_util/audit_logging_utils.h
+++ b/test/core/test_util/audit_logging_utils.h
@@ -17,6 +17,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_AUDIT_LOGGING_UTILS_H
 #define GRPC_TEST_CORE_TEST_UTIL_AUDIT_LOGGING_UTILS_H
 
+#include <grpc/grpc_audit_logging.h>
+#include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -24,10 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
-#include <grpc/grpc_audit_logging.h>
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/cmdline.cc b/test/core/test_util/cmdline.cc
index b22d0767c09..c4bcb299144 100644
--- a/test/core/test_util/cmdline.cc
+++ b/test/core/test_util/cmdline.cc
@@ -18,6 +18,7 @@
 
 #include "test/core/test_util/cmdline.h"
 
+#include <grpc/support/alloc.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,9 +31,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/memory.h"
 
 typedef enum { ARGTYPE_INT, ARGTYPE_BOOL, ARGTYPE_STRING } argtype;
diff --git a/test/core/test_util/cmdline.h b/test/core/test_util/cmdline.h
index d118d6a9412..91915d7551c 100644
--- a/test/core/test_util/cmdline.h
+++ b/test/core/test_util/cmdline.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_CMDLINE_H
 #define GRPC_TEST_CORE_TEST_UTIL_CMDLINE_H
 
+#include <grpc/support/port_platform.h>
+
 #include <string>
 
 #include "absl/log/log.h"
 
-#include <grpc/support/port_platform.h>
-
 /// Simple command line parser.
 
 /// Supports flags that can be specified as -foo, --foo, --no-foo, -no-foo, etc
diff --git a/test/core/test_util/cmdline_test.cc b/test/core/test_util/cmdline_test.cc
index c292c768fbc..b94ade30dfa 100644
--- a/test/core/test_util/cmdline_test.cc
+++ b/test/core/test_util/cmdline_test.cc
@@ -22,7 +22,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/test_util/evaluate_args_test_util.h b/test/core/test_util/evaluate_args_test_util.h
index 2d681d3b50f..f53aee93022 100644
--- a/test/core/test_util/evaluate_args_test_util.h
+++ b/test/core/test_util/evaluate_args_test_util.h
@@ -15,16 +15,14 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_EVALUATE_ARGS_TEST_UTIL_H
 #define GRPC_TEST_CORE_TEST_UTIL_EVALUATE_ARGS_TEST_UTIL_H
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <memory>
 
 #include "absl/strings/string_view.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/handshaker/endpoint_info/endpoint_info_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/test_util/fake_stats_plugin.cc b/test/core/test_util/fake_stats_plugin.cc
index 3ce9431cd66..74d7dcecc1f 100644
--- a/test/core/test_util/fake_stats_plugin.cc
+++ b/test/core/test_util/fake_stats_plugin.cc
@@ -15,7 +15,6 @@
 #include "test/core/test_util/fake_stats_plugin.h"
 
 #include "absl/log/check.h"
-
 #include "src/core/lib/config/core_configuration.h"
 
 namespace grpc_core {
diff --git a/test/core/test_util/fake_stats_plugin.h b/test/core/test_util/fake_stats_plugin.h
index 4c60f0735fb..983213e71de 100644
--- a/test/core/test_util/fake_stats_plugin.h
+++ b/test/core/test_util/fake_stats_plugin.h
@@ -28,7 +28,6 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "gmock/gmock.h"
-
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/telemetry/metrics.h"
diff --git a/test/core/test_util/fake_udp_and_tcp_server.cc b/test/core/test_util/fake_udp_and_tcp_server.cc
index 68cc354b7a4..92118fa248e 100644
--- a/test/core/test_util/fake_udp_and_tcp_server.cc
+++ b/test/core/test_util/fake_udp_and_tcp_server.cc
@@ -17,6 +17,8 @@
 #include "test/core/test_util/fake_udp_and_tcp_server.h"
 
 #include <errno.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <set>
@@ -27,10 +29,6 @@
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/test_util/fake_udp_and_tcp_server.h b/test/core/test_util/fake_udp_and_tcp_server.h
index 3032f254f26..35a54471723 100644
--- a/test/core/test_util/fake_udp_and_tcp_server.h
+++ b/test/core/test_util/fake_udp_and_tcp_server.h
@@ -17,14 +17,14 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_FAKE_UDP_AND_TCP_SERVER_H
 #define GRPC_TEST_CORE_TEST_UTIL_FAKE_UDP_AND_TCP_SERVER_H
 
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+
 #include <functional>
 #include <memory>
 #include <string>
 #include <thread>
 
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/fuzz_config_vars_helpers.cc b/test/core/test_util/fuzz_config_vars_helpers.cc
index 9029fdfd665..60075e0dee1 100644
--- a/test/core/test_util/fuzz_config_vars_helpers.cc
+++ b/test/core/test_util/fuzz_config_vars_helpers.cc
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include "absl/strings/str_join.h"
-
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/experiments/experiments.h"
 
diff --git a/test/core/test_util/fuzz_config_vars_helpers.h b/test/core/test_util/fuzz_config_vars_helpers.h
index 05edc5dc4b9..1601f49775f 100644
--- a/test/core/test_util/fuzz_config_vars_helpers.h
+++ b/test/core/test_util/fuzz_config_vars_helpers.h
@@ -15,12 +15,11 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H
 #define GRPC_TEST_CORE_TEST_UTIL_FUZZ_CONFIG_VARS_HELPERS_H
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <string>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 std::string ValidateExperimentsStringForFuzzing(uint64_t experiments);
diff --git a/test/core/test_util/fuzzer_corpus_test.cc b/test/core/test_util/fuzzer_corpus_test.cc
index 3eaef693f10..a80eff40bf4 100644
--- a/test/core/test_util/fuzzer_corpus_test.cc
+++ b/test/core/test_util/fuzzer_corpus_test.cc
@@ -17,6 +17,8 @@
 //
 
 #include <dirent.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,10 +33,6 @@
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/env.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/test_util/fuzzer_util.cc b/test/core/test_util/fuzzer_util.cc
index 5e55638af7e..05301487575 100644
--- a/test/core/test_util/fuzzer_util.cc
+++ b/test/core/test_util/fuzzer_util.cc
@@ -18,12 +18,11 @@
 
 #include "test/core/test_util/fuzzer_util.h"
 
+#include <grpc/support/alloc.h>
 #include <stddef.h>
 
 #include <algorithm>
 
-#include <grpc/support/alloc.h>
-
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/fuzzing_channel_args.h b/test/core/test_util/fuzzing_channel_args.h
index 83cb5497bd3..cae31e99eb7 100644
--- a/test/core/test_util/fuzzing_channel_args.h
+++ b/test/core/test_util/fuzzing_channel_args.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_FUZZING_CHANNEL_ARGS_H
 #define GRPC_TEST_CORE_TEST_UTIL_FUZZING_CHANNEL_ARGS_H
 
-#include <memory>
-
 #include <grpc/support/port_platform.h>
 
+#include <memory>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/test_util/histogram.cc b/test/core/test_util/histogram.cc
index c1b88b99268..d94e78dc990 100644
--- a/test/core/test_util/histogram.cc
+++ b/test/core/test_util/histogram.cc
@@ -18,14 +18,12 @@
 
 #include "test/core/test_util/histogram.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <math.h>
 #include <stddef.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/useful.h"
 
 // Histograms are stored with exponentially increasing bucket sizes.
diff --git a/test/core/test_util/histogram.h b/test/core/test_util/histogram.h
index d3e6ba52b40..98523fb61d8 100644
--- a/test/core/test_util/histogram.h
+++ b/test/core/test_util/histogram.h
@@ -19,11 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_HISTOGRAM_H
 #define GRPC_TEST_CORE_TEST_UTIL_HISTOGRAM_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include <grpc/support/port_platform.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/test/core/test_util/mock_endpoint.cc b/test/core/test_util/mock_endpoint.cc
index 8d16b2293ee..5706d8cedc3 100644
--- a/test/core/test_util/mock_endpoint.cc
+++ b/test/core/test_util/mock_endpoint.cc
@@ -18,16 +18,15 @@
 
 #include "test/core/test_util/mock_endpoint.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+
 #include <memory>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
 #include "src/core/util/down_cast.h"
diff --git a/test/core/test_util/mock_endpoint.h b/test/core/test_util/mock_endpoint.h
index 901b21eedd6..ccc8d74af28 100644
--- a/test/core/test_util/mock_endpoint.h
+++ b/test/core/test_util/mock_endpoint.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_MOCK_ENDPOINT_H
 #define GRPC_TEST_CORE_TEST_UTIL_MOCK_ENDPOINT_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/slice.h>
 
+#include <memory>
+
 #include "src/core/lib/iomgr/endpoint.h"
 
 namespace grpc_event_engine {
diff --git a/test/core/test_util/one_corpus_entry_fuzzer.cc b/test/core/test_util/one_corpus_entry_fuzzer.cc
index d6cbe2b6827..71325b589fc 100644
--- a/test/core/test_util/one_corpus_entry_fuzzer.cc
+++ b/test/core/test_util/one_corpus_entry_fuzzer.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
 #include <stdbool.h>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/crash.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/core/test_util/parse_hexstring.cc b/test/core/test_util/parse_hexstring.cc
index 0ede85e2c09..4468f9d97ce 100644
--- a/test/core/test_util/parse_hexstring.cc
+++ b/test/core/test_util/parse_hexstring.cc
@@ -18,13 +18,12 @@
 
 #include "test/core/test_util/parse_hexstring.h"
 
+#include <grpc/slice.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "absl/log/check.h"
 
-#include <grpc/slice.h>
-
 namespace grpc_core {
 Slice ParseHexstring(absl::string_view hexstring) {
   size_t nibbles = 0;
diff --git a/test/core/test_util/parse_hexstring.h b/test/core/test_util/parse_hexstring.h
index fe50f9bf959..d43f0148031 100644
--- a/test/core/test_util/parse_hexstring.h
+++ b/test/core/test_util/parse_hexstring.h
@@ -20,7 +20,6 @@
 #define GRPC_TEST_CORE_TEST_UTIL_PARSE_HEXSTRING_H
 
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/slice/slice.h"
 
 namespace grpc_core {
diff --git a/test/core/test_util/passthrough_endpoint.h b/test/core/test_util/passthrough_endpoint.h
index cf8abe834d1..b8fe820f6e4 100644
--- a/test/core/test_util/passthrough_endpoint.h
+++ b/test/core/test_util/passthrough_endpoint.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_PASSTHROUGH_ENDPOINT_H
 #define GRPC_TEST_CORE_TEST_UTIL_PASSTHROUGH_ENDPOINT_H
 
-#include <memory>
-
 #include <grpc/event_engine/event_engine.h>
 
+#include <memory>
+
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/util/ref_counted.h"
diff --git a/test/core/test_util/port.cc b/test/core/test_util/port.cc
index 3a5a04bf117..bac509ee232 100644
--- a/test/core/test_util/port.cc
+++ b/test/core/test_util/port.cc
@@ -18,17 +18,15 @@
 
 #include "src/core/lib/iomgr/port.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-
 #include "src/core/util/sync.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/port_server_client.h"
diff --git a/test/core/test_util/port_isolated_runtime_environment.cc b/test/core/test_util/port_isolated_runtime_environment.cc
index 57fa3865112..8c429df1e66 100644
--- a/test/core/test_util/port_isolated_runtime_environment.cc
+++ b/test/core/test_util/port_isolated_runtime_environment.cc
@@ -22,13 +22,11 @@
 // runs in a separate container) the framework takes a round-robin pick of a
 // port within certain range. There is no need to recycle ports.
 //
-#include <stdlib.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
+#include <stdlib.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "test/core/test_util/port.h"
diff --git a/test/core/test_util/port_server_client.cc b/test/core/test_util/port_server_client.cc
index 5a8b4d4d2ed..65287efbe48 100644
--- a/test/core/test_util/port_server_client.cc
+++ b/test/core/test_util/port_server_client.cc
@@ -18,6 +18,13 @@
 
 #include "test/core/test_util/port_server_client.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,15 +38,6 @@
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/test_util/proto_bit_gen.h b/test/core/test_util/proto_bit_gen.h
index 3732acca2a2..5f307ab7363 100644
--- a/test/core/test_util/proto_bit_gen.h
+++ b/test/core/test_util/proto_bit_gen.h
@@ -15,6 +15,7 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_PROTO_BIT_GEN_H
 #define GRPC_TEST_CORE_TEST_UTIL_PROTO_BIT_GEN_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <cstdint>
@@ -22,8 +23,6 @@
 #include <random>
 #include <vector>
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 // Set of random numbers from a proto file (or other container) forming a bit
diff --git a/test/core/test_util/reconnect_server.cc b/test/core/test_util/reconnect_server.cc
index 871c1298f8b..478e078cecd 100644
--- a/test/core/test_util/reconnect_server.cc
+++ b/test/core/test_util/reconnect_server.cc
@@ -18,14 +18,12 @@
 
 #include "test/core/test_util/reconnect_server.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include "absl/log/log.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
diff --git a/test/core/test_util/reconnect_server.h b/test/core/test_util/reconnect_server.h
index d04661c9c6e..018362985d7 100644
--- a/test/core/test_util/reconnect_server.h
+++ b/test/core/test_util/reconnect_server.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_RECONNECT_SERVER_H
 #define GRPC_TEST_CORE_TEST_UTIL_RECONNECT_SERVER_H
 
-#include <string>
-
 #include <grpc/support/time.h>
 
+#include <string>
+
 #include "test/core/test_util/test_tcp_server.h"
 
 typedef struct timestamp_list {
diff --git a/test/core/test_util/resolve_localhost_ip46.cc b/test/core/test_util/resolve_localhost_ip46.cc
index ba58738b8e4..c2cb8077407 100644
--- a/test/core/test_util/resolve_localhost_ip46.cc
+++ b/test/core/test_util/resolve_localhost_ip46.cc
@@ -18,15 +18,14 @@
 
 #include "test/core/test_util/resolve_localhost_ip46.h"
 
+#include <grpc/support/sync.h>
+
 #include <memory>
 #include <vector>
 
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/core/test_util/slice_splitter.cc b/test/core/test_util/slice_splitter.cc
index 0190255bc44..e2211e152ff 100644
--- a/test/core/test_util/slice_splitter.cc
+++ b/test/core/test_util/slice_splitter.cc
@@ -18,14 +18,13 @@
 
 #include "test/core/test_util/slice_splitter.h"
 
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <algorithm>
 
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-
 const char* grpc_slice_split_mode_name(grpc_slice_split_mode mode) {
   switch (mode) {
     case GRPC_SLICE_SPLIT_IDENTITY:
diff --git a/test/core/test_util/slice_splitter.h b/test/core/test_util/slice_splitter.h
index 8af3dc7ac8e..90e8107db53 100644
--- a/test/core/test_util/slice_splitter.h
+++ b/test/core/test_util/slice_splitter.h
@@ -22,9 +22,8 @@
 // utility function to split/merge slices together to help create test
 // cases
 
-#include <stddef.h>
-
 #include <grpc/slice.h>
+#include <stddef.h>
 
 typedef enum {
   // merge all input slices into a single slice
diff --git a/test/core/test_util/socket_use_after_close_detector.cc b/test/core/test_util/socket_use_after_close_detector.cc
index 8d2c77b2555..546936d4122 100644
--- a/test/core/test_util/socket_use_after_close_detector.cc
+++ b/test/core/test_util/socket_use_after_close_detector.cc
@@ -20,13 +20,14 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
-
 #include <grpc/support/port_platform.h>
+#include <string.h>
 
 // IWYU pragma: no_include <arpa/inet.h>
 // IWYU pragma: no_include <unistd.h>
 
+#include <grpc/support/sync.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -35,9 +36,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "test/core/test_util/port.h"
 
diff --git a/test/core/test_util/socket_use_after_close_detector.h b/test/core/test_util/socket_use_after_close_detector.h
index 67e7b2e73bd..36b333b82ee 100644
--- a/test/core/test_util/socket_use_after_close_detector.h
+++ b/test/core/test_util/socket_use_after_close_detector.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_SOCKET_USE_AFTER_CLOSE_DETECTOR_H
 #define GRPC_TEST_CORE_TEST_UTIL_SOCKET_USE_AFTER_CLOSE_DETECTOR_H
 
-#include <memory>
-#include <thread>
-
 #include <grpc/support/port_platform.h>
 #include <grpc/support/sync_generic.h>
 
+#include <memory>
+#include <thread>
+
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/stack_tracer.cc b/test/core/test_util/stack_tracer.cc
index 305a43c8fc4..979e5dad534 100644
--- a/test/core/test_util/stack_tracer.cc
+++ b/test/core/test_util/stack_tracer.cc
@@ -18,14 +18,13 @@
 
 #include "test/core/test_util/stack_tracer.h"
 
+#include <grpc/support/port_platform.h>
+
 #include <cstdio>
 #include <string>
 
 #include "absl/debugging/stacktrace.h"
 #include "absl/debugging/symbolize.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/examine_stack.h"
 
 namespace {
diff --git a/test/core/test_util/stack_tracer.h b/test/core/test_util/stack_tracer.h
index 82870cbe770..e1b231862d8 100644
--- a/test/core/test_util/stack_tracer.h
+++ b/test/core/test_util/stack_tracer.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_STACK_TRACER_H
 #define GRPC_TEST_CORE_TEST_UTIL_STACK_TRACER_H
 
-#include <string>
-
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 namespace grpc_core {
 namespace testing {
 
diff --git a/test/core/test_util/stack_tracer_test.cc b/test/core/test_util/stack_tracer_test.cc
index 701ffaddbfe..36039e2ac27 100644
--- a/test/core/test_util/stack_tracer_test.cc
+++ b/test/core/test_util/stack_tracer_test.cc
@@ -23,7 +23,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 TEST(StackTracerTest, Basic) {
diff --git a/test/core/test_util/test_config.cc b/test/core/test_util/test_config.cc
index 0395887fe7a..b8682828119 100644
--- a/test/core/test_util/test_config.cc
+++ b/test/core/test_util/test_config.cc
@@ -18,6 +18,9 @@
 
 #include "test/core/test_util/test_config.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -31,11 +34,6 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/surface/init.h"
 #include "src/core/util/crash.h"
 #include "test/core/event_engine/test_init.h"
diff --git a/test/core/test_util/test_config.h b/test/core/test_util/test_config.h
index 5fb385ce31c..8a2020af2ce 100644
--- a/test/core/test_util/test_config.h
+++ b/test/core/test_util/test_config.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_CONFIG_H
 #define GRPC_TEST_CORE_TEST_UTIL_TEST_CONFIG_H
 
-#include <stdint.h>
-
 #include <grpc/support/time.h>
+#include <stdint.h>
 
 extern int64_t g_fixture_slowdown_factor;
 extern int64_t g_poller_slowdown_factor;
diff --git a/test/core/test_util/test_lb_policies.cc b/test/core/test_util/test_lb_policies.cc
index afd701417cb..d02b224793a 100644
--- a/test/core/test_util/test_lb_policies.cc
+++ b/test/core/test_util/test_lb_policies.cc
@@ -16,6 +16,8 @@
 
 #include "test/core/test_util/test_lb_policies.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
 #include <stdint.h>
 
 #include <memory>
@@ -26,10 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-
 #include "src/core/client_channel/lb_metadata.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/test_util/test_lb_policies.h b/test/core/test_util/test_lb_policies.h
index 235a6990734..18c016fb80f 100644
--- a/test/core/test_util/test_lb_policies.h
+++ b/test/core/test_util/test_lb_policies.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_LB_POLICIES_H
 #define GRPC_TEST_CORE_TEST_UTIL_TEST_LB_POLICIES_H
 
+#include <grpc/support/port_platform.h>
+
 #include <atomic>
 #include <functional>
 #include <string>
@@ -25,9 +27,6 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/backend_metric_data.h"
 #include "src/core/resolver/endpoint_addresses.h"
diff --git a/test/core/test_util/test_tcp_server.cc b/test/core/test_util/test_tcp_server.cc
index cc3d2957648..25193394c40 100644
--- a/test/core/test_util/test_tcp_server.cc
+++ b/test/core/test_util/test_tcp_server.cc
@@ -18,6 +18,10 @@
 
 #include "test/core/test_util/test_tcp_server.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -25,12 +29,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/test_util/test_tcp_server.h b/test/core/test_util/test_tcp_server.h
index 66818e1b774..634fc728633 100644
--- a/test/core/test_util/test_tcp_server.h
+++ b/test/core/test_util/test_tcp_server.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TEST_TCP_SERVER_H
 #define GRPC_TEST_CORE_TEST_UTIL_TEST_TCP_SERVER_H
 
-#include <vector>
-
 #include <grpc/support/sync.h>
 
+#include <vector>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/iomgr/tcp_server.h"
diff --git a/test/core/test_util/tls_utils.cc b/test/core/test_util/tls_utils.cc
index c2dfd13eea9..a891e43c33c 100644
--- a/test/core/test_util/tls_utils.cc
+++ b/test/core/test_util/tls_utils.cc
@@ -15,16 +15,14 @@
 //
 #include "test/core/test_util/tls_utils.h"
 
-#include <stdio.h>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/slice.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
+#include <stdio.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/util/load_file.h"
diff --git a/test/core/test_util/tls_utils.h b/test/core/test_util/tls_utils.h
index 5cd12ac6a10..4c9ccf720da 100644
--- a/test/core/test_util/tls_utils.h
+++ b/test/core/test_util/tls_utils.h
@@ -17,17 +17,16 @@
 #ifndef GRPC_TEST_CORE_TEST_UTIL_TLS_UTILS_H
 #define GRPC_TEST_CORE_TEST_UTIL_TLS_UTILS_H
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/status.h>
+
 #include <deque>
 #include <string>
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/sync.h"
 #include "src/core/util/thd.h"
diff --git a/test/core/transport/bdp_estimator_test.cc b/test/core/transport/bdp_estimator_test.cc
index b8e0ded91a0..b7174df8e93 100644
--- a/test/core/transport/bdp_estimator_test.cc
+++ b/test/core/transport/bdp_estimator_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/lib/transport/bdp_estimator.h"
 
+#include <grpc/grpc.h>
 #include <stdlib.h>
 
 #include <algorithm>
 #include <atomic>
 
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/benchmarks/bm_chaotic_good.cc b/test/core/transport/benchmarks/bm_chaotic_good.cc
index 362693429d6..6610e66e1aa 100644
--- a/test/core/transport/benchmarks/bm_chaotic_good.cc
+++ b/test/core/transport/benchmarks/bm_chaotic_good.cc
@@ -13,12 +13,10 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/core/transport/benchmarks/bm_inproc.cc b/test/core/transport/benchmarks/bm_inproc.cc
index f7725628f45..cb8d1fe31c3 100644
--- a/test/core/transport/benchmarks/bm_inproc.cc
+++ b/test/core/transport/benchmarks/bm_inproc.cc
@@ -12,15 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
+
+#include <memory>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "test/core/transport/call_spine_benchmarks.h"
diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc
index 5ad7150e8e2..959a6fd33a0 100644
--- a/test/core/transport/binder/binder_transport_test.cc
+++ b/test/core/transport/binder/binder_transport_test.cc
@@ -18,19 +18,17 @@
 // transform into the correct sequence of binder transactions.
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_join.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_stream.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/notification.h"
diff --git a/test/core/transport/binder/end2end/binder_server_test.cc b/test/core/transport/binder/end2end/binder_server_test.cc
index a1d26094e42..da17a099e4b 100644
--- a/test/core/transport/binder/end2end/binder_server_test.cc
+++ b/test/core/transport/binder/end2end/binder_server_test.cc
@@ -14,18 +14,16 @@
 
 #include "src/core/ext/transport/binder/server/binder_server.h"
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/binder_credentials.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/binder_credentials.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/client/channel_create_impl.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/end2end/fake_binder.h"
diff --git a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
index 7c24090894e..bc8f7be9078 100644
--- a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
+++ b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
@@ -12,18 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <thread>
 #include <utility>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
 #include "absl/time/time.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc
index 6a5cc9698ac..d3e93f50ada 100644
--- a/test/core/transport/binder/end2end/fake_binder.cc
+++ b/test/core/transport/binder/end2end/fake_binder.cc
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc_binder {
diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h
index 6dbb532a230..46877bfb9de 100644
--- a/test/core/transport/binder/end2end/fake_binder.h
+++ b/test/core/transport/binder/end2end/fake_binder.h
@@ -63,7 +63,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/variant.h"
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
 #include "src/core/util/sync.h"
diff --git a/test/core/transport/binder/end2end/fake_binder_test.cc b/test/core/transport/binder/end2end/fake_binder_test.cc
index 47bcc3704bc..68875bcd864 100644
--- a/test/core/transport/binder/end2end/fake_binder_test.cc
+++ b/test/core/transport/binder/end2end/fake_binder_test.cc
@@ -14,17 +14,16 @@
 
 #include "test/core/transport/binder/end2end/fake_binder.h"
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <random>
 #include <string>
 #include <utility>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/strings/str_format.h"
 #include "absl/time/time.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_binder {
diff --git a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
index e62c056c8b7..e852b032fcb 100644
--- a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
+++ b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <thread>
 #include <utility>
 
 #include "absl/log/check.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/executor.h"
diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
index 8b4affab2cc..ee47780b227 100644
--- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
+++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
@@ -23,7 +23,6 @@
 
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
-
 #include "src/core/ext/transport/binder/wire_format/binder.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
index bc8f0400b00..d0fdaab3400 100644
--- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
+++ b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
@@ -12,10 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/log/check.h"
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/iomgr/executor.h"
diff --git a/test/core/transport/binder/end2end/testing_channel_create.cc b/test/core/transport/binder/end2end/testing_channel_create.cc
index 50d9470960e..58a9a03006d 100644
--- a/test/core/transport/binder/end2end/testing_channel_create.cc
+++ b/test/core/transport/binder/end2end/testing_channel_create.cc
@@ -14,12 +14,11 @@
 
 #include "test/core/transport/binder/end2end/testing_channel_create.h"
 
+#include <grpcpp/security/binder_security_policy.h>
+
 #include <utility>
 
 #include "absl/log/check.h"
-
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/binder/end2end/testing_channel_create.h b/test/core/transport/binder/end2end/testing_channel_create.h
index 8838f7265e7..2efe71365fe 100644
--- a/test/core/transport/binder/end2end/testing_channel_create.h
+++ b/test/core/transport/binder/end2end/testing_channel_create.h
@@ -15,10 +15,10 @@
 #ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H
 #define GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H
 
-#include <utility>
-
 #include <grpcpp/grpcpp.h>
 
+#include <utility>
+
 #include "src/core/ext/transport/binder/transport/binder_transport.h"
 #include "src/core/server/server.h"
 #include "test/core/transport/binder/end2end/fake_binder.h"
diff --git a/test/core/transport/binder/endpoint_binder_pool_test.cc b/test/core/transport/binder/endpoint_binder_pool_test.cc
index bba32557f4c..5086a2ea18c 100644
--- a/test/core/transport/binder/endpoint_binder_pool_test.cc
+++ b/test/core/transport/binder/endpoint_binder_pool_test.cc
@@ -14,16 +14,15 @@
 
 #include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <cassert>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/mock_objects.h"
 
diff --git a/test/core/transport/binder/transport_stream_receiver_test.cc b/test/core/transport/binder/transport_stream_receiver_test.cc
index 76d2689b8c4..86ead7f5c17 100644
--- a/test/core/transport/binder/transport_stream_receiver_test.cc
+++ b/test/core/transport/binder/transport_stream_receiver_test.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <cassert>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
 #include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/transport/binder/wire_reader_test.cc b/test/core/transport/binder/wire_reader_test.cc
index 75a7432628d..bdfeaa98e8b 100644
--- a/test/core/transport/binder/wire_reader_test.cc
+++ b/test/core/transport/binder/wire_reader_test.cc
@@ -19,18 +19,16 @@
 // WireReaderImpl and both the output (readable) parcel and the transport stream
 // receiver are correct in all possible situations.
 
+#include <grpc/grpc.h>
+#include <grpcpp/security/binder_security_policy.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-
 #include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/mock_objects.h"
diff --git a/test/core/transport/binder/wire_writer_test.cc b/test/core/transport/binder/wire_writer_test.cc
index 851430bdeff..7dffe26d5ab 100644
--- a/test/core/transport/binder/wire_writer_test.cc
+++ b/test/core/transport/binder/wire_writer_test.cc
@@ -14,15 +14,13 @@
 
 #include "src/core/ext/transport/binder/wire_format/wire_writer.h"
 
+#include <grpcpp/impl/grpc_library.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <utility>
 
-#include <gtest/gtest.h>
-
 #include "absl/memory/memory.h"
-
-#include <grpcpp/impl/grpc_library.h>
-
 #include "test/core/test_util/test_config.h"
 #include "test/core/transport/binder/mock_objects.h"
 
diff --git a/test/core/transport/bm_call_spine.cc b/test/core/transport/bm_call_spine.cc
index 7a757a5d733..749c2c9f5ae 100644
--- a/test/core/transport/bm_call_spine.cc
+++ b/test/core/transport/bm_call_spine.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
 #include "src/core/lib/event_engine/default_event_engine.h"
diff --git a/test/core/transport/call_arena_allocator_test.cc b/test/core/transport/call_arena_allocator_test.cc
index 1c5c222cf86..32235066106 100644
--- a/test/core/transport/call_arena_allocator_test.cc
+++ b/test/core/transport/call_arena_allocator_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/lib/transport/call_arena_allocator.h"
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <string.h>
 
@@ -31,10 +33,6 @@
 #include "absl/strings/str_join.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/transport/call_filters_test.cc b/test/core/transport/call_filters_test.cc
index 77973df2c48..7e8a5e3c3ca 100644
--- a/test/core/transport/call_filters_test.cc
+++ b/test/core/transport/call_filters_test.cc
@@ -18,7 +18,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/promise/poll_matcher.h"
 
 using testing::Mock;
diff --git a/test/core/transport/call_spine_benchmarks.h b/test/core/transport/call_spine_benchmarks.h
index d89f3678bdb..c62f1e21733 100644
--- a/test/core/transport/call_spine_benchmarks.h
+++ b/test/core/transport/call_spine_benchmarks.h
@@ -18,7 +18,6 @@
 #include <memory>
 
 #include "benchmark/benchmark.h"
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/transport/call_spine_test.cc b/test/core/transport/call_spine_test.cc
index b5807e28ec7..cd1c8020d5f 100644
--- a/test/core/transport/call_spine_test.cc
+++ b/test/core/transport/call_spine_test.cc
@@ -14,6 +14,8 @@
 
 #include "src/core/lib/transport/call_spine.h"
 
+#include <grpc/grpc.h>
+
 #include <atomic>
 #include <memory>
 #include <queue>
@@ -21,9 +23,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/transport/metadata.h"
 #include "test/core/call/yodel/yodel_test.h"
diff --git a/test/core/transport/call_state_test.cc b/test/core/transport/call_state_test.cc
index fcdf91b2818..4ad4a0ebe80 100644
--- a/test/core/transport/call_state_test.cc
+++ b/test/core/transport/call_state_test.cc
@@ -18,7 +18,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/promise/poll_matcher.h"
 
 using testing::Mock;
diff --git a/test/core/transport/chaotic_good/chaotic_good_server_test.cc b/test/core/transport/chaotic_good/chaotic_good_server_test.cc
index 1f1335f5f6c..b76b97b4bfc 100644
--- a/test/core/transport/chaotic_good/chaotic_good_server_test.cc
+++ b/test/core/transport/chaotic_good/chaotic_good_server_test.cc
@@ -14,6 +14,11 @@
 
 #include "src/core/ext/transport/chaotic_good/server/chaotic_good_server.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+#include <grpcpp/server.h>
+
 #include <memory>
 #include <string>
 #include <utility>
@@ -24,12 +29,6 @@
 #include "absl/time/time.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-#include <grpcpp/server.h>
-
 #include "src/core/ext/transport/chaotic_good/client/chaotic_good_connector.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc
index 8de27018183..99caac0602e 100644
--- a/test/core/transport/chaotic_good/client_transport_error_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_error_test.cc
@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -28,14 +34,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc
index aad18ee1601..1739d1bbcec 100644
--- a/test/core/transport/chaotic_good/client_transport_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_test.cc
@@ -14,6 +14,13 @@
 
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
@@ -29,14 +36,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/promise/if.h"
 #include "src/core/lib/promise/loop.h"
diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc
index 3082b3645f0..11d2e3f64c5 100644
--- a/test/core/transport/chaotic_good/frame_fuzzer.cc
+++ b/test/core/transport/chaotic_good/frame_fuzzer.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -22,9 +23,6 @@
 #include "absl/log/log.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/status/statusor.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
diff --git a/test/core/transport/chaotic_good/frame_header_fuzzer.cc b/test/core/transport/chaotic_good/frame_header_fuzzer.cc
index eaed3bfc379..765f7c35f0e 100644
--- a/test/core/transport/chaotic_good/frame_header_fuzzer.cc
+++ b/test/core/transport/chaotic_good/frame_header_fuzzer.cc
@@ -17,7 +17,6 @@
 #include <string.h>
 
 #include "absl/status/statusor.h"
-
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 
 bool squelch = false;
diff --git a/test/core/transport/chaotic_good/frame_test.cc b/test/core/transport/chaotic_good/frame_test.cc
index 8fc0f2b41eb..2ca7a446e74 100644
--- a/test/core/transport/chaotic_good/frame_test.cc
+++ b/test/core/transport/chaotic_good/frame_test.cc
@@ -21,7 +21,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 
diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.cc b/test/core/transport/chaotic_good/mock_promise_endpoint.cc
index 9ba96e75804..33ab43b817c 100644
--- a/test/core/transport/chaotic_good/mock_promise_endpoint.cc
+++ b/test/core/transport/chaotic_good/mock_promise_endpoint.cc
@@ -14,11 +14,11 @@
 
 #include "test/core/transport/chaotic_good/mock_promise_endpoint.h"
 
+#include <grpc/event_engine/event_engine.h>
+
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include <grpc/event_engine/event_engine.h>
-
 using EventEngineSlice = grpc_event_engine::experimental::Slice;
 using grpc_event_engine::experimental::EventEngine;
 
diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.h b/test/core/transport/chaotic_good/mock_promise_endpoint.h
index bf073e4644f..314883a257b 100644
--- a/test/core/transport/chaotic_good/mock_promise_endpoint.h
+++ b/test/core/transport/chaotic_good/mock_promise_endpoint.h
@@ -15,11 +15,10 @@
 #ifndef GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H
 #define GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/event_engine/event_engine.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/transport/promise_endpoint.h"
 
diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc
index f3ab7f3a350..72e62a89682 100644
--- a/test/core/transport/chaotic_good/server_transport_test.cc
+++ b/test/core/transport/chaotic_good/server_transport_test.cc
@@ -14,6 +14,13 @@
 
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
@@ -26,14 +33,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>
-#include <grpc/event_engine/slice_buffer.h>
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/transport/chaotic_good/transport_test.h b/test/core/transport/chaotic_good/transport_test.h
index 5f9dd8845d3..d6269c6e984 100644
--- a/test/core/transport/chaotic_good/transport_test.h
+++ b/test/core/transport/chaotic_good/transport_test.h
@@ -17,7 +17,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/lib/event_engine/event_engine_context.h"
 #include "src/core/lib/iomgr/timer_manager.h"
diff --git a/test/core/transport/chttp2/alpn_test.cc b/test/core/transport/chttp2/alpn_test.cc
index 43fbe2e583d..52286d81752 100644
--- a/test/core/transport/chttp2/alpn_test.cc
+++ b/test/core/transport/chttp2/alpn_test.cc
@@ -21,7 +21,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 TEST(AlpnTest, TestAlpnSuccess) {
diff --git a/test/core/transport/chttp2/bin_decoder_test.cc b/test/core/transport/chttp2/bin_decoder_test.cc
index 40f67db8583..5eca263f44c 100644
--- a/test/core/transport/chttp2/bin_decoder_test.cc
+++ b/test/core/transport/chttp2/bin_decoder_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_decoder.h"
 
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
diff --git a/test/core/transport/chttp2/bin_encoder_test.cc b/test/core/transport/chttp2/bin_encoder_test.cc
index bb52b4bd766..f54407d809a 100644
--- a/test/core/transport/chttp2/bin_encoder_test.cc
+++ b/test/core/transport/chttp2/bin_encoder_test.cc
@@ -18,17 +18,14 @@
 
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include <memory>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/slice/slice_string_helpers.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/chttp2/decode_huff_fuzzer.cc b/test/core/transport/chttp2/decode_huff_fuzzer.cc
index 6a9d34d2371..851f023f203 100644
--- a/test/core/transport/chttp2/decode_huff_fuzzer.cc
+++ b/test/core/transport/chttp2/decode_huff_fuzzer.cc
@@ -23,7 +23,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 #include "src/core/ext/transport/chttp2/transport/huffsyms.h"
 
diff --git a/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc b/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc
index 5d1f9c46718..dfc2c489d04 100644
--- a/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc
+++ b/test/core/transport/chttp2/encode_decode_huff_fuzzer.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/slice.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,9 +25,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 
diff --git a/test/core/transport/chttp2/flow_control_fuzzer.cc b/test/core/transport/chttp2/flow_control_fuzzer.cc
index b72541d4d38..8d0a8406f11 100644
--- a/test/core/transport/chttp2/flow_control_fuzzer.cc
+++ b/test/core/transport/chttp2/flow_control_fuzzer.cc
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_request.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,10 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/event_engine/memory_request.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/transport/chttp2/flow_control_test.cc b/test/core/transport/chttp2/flow_control_test.cc
index 618cdfb0643..8ed9ea03ed9 100644
--- a/test/core/transport/chttp2/flow_control_test.cc
+++ b/test/core/transport/chttp2/flow_control_test.cc
@@ -14,14 +14,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 
+#include <grpc/support/time.h>
+
 #include <memory>
 #include <tuple>
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/transport/chttp2/frame_test.cc b/test/core/transport/chttp2/frame_test.cc
index a353d0fa1ef..456d8a01af4 100644
--- a/test/core/transport/chttp2/frame_test.cc
+++ b/test/core/transport/chttp2/frame_test.cc
@@ -21,7 +21,6 @@
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/transport/http2_errors.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/chttp2/graceful_shutdown_test.cc b/test/core/transport/chttp2/graceful_shutdown_test.cc
index 7402c2ba28c..47e8524cf81 100644
--- a/test/core/transport/chttp2/graceful_shutdown_test.cc
+++ b/test/core/transport/chttp2/graceful_shutdown_test.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -35,14 +41,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/channelz/channelz.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
diff --git a/test/core/transport/chttp2/hpack_encoder_test.cc b/test/core/transport/chttp2/hpack_encoder_test.cc
index 141d38f71c4..947161ecf75 100644
--- a/test/core/transport/chttp2/hpack_encoder_test.cc
+++ b/test/core/transport/chttp2/hpack_encoder_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/slice_buffer.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -27,10 +29,6 @@
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/slice_buffer.h>
-
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/arena.h"
diff --git a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
index 7954ccbaeca..a76df38bf00 100644
--- a/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_fuzzer_test.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -25,10 +27,6 @@
 #include "absl/cleanup/cleanup.h"
 #include "absl/log/check.h"
 #include "absl/random/bit_gen_ref.h"
-
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/iomgr/error.h"
diff --git a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc
index c01dff488a8..7aeda797263 100644
--- a/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc
+++ b/test/core/transport/chttp2/hpack_parser_input_size_fuzzer.cc
@@ -15,6 +15,10 @@
 // For all inputs, ensure parsing one byte at a time produces the same result as
 // parsing the entire input at once.
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,12 +32,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/transport/chttp2/hpack_parser_table_test.cc b/test/core/transport/chttp2/hpack_parser_table_test.cc
index 8743b079006..48632fe86cd 100644
--- a/test/core/transport/chttp2/hpack_parser_table_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_table_test.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser_table.h"
 
+#include <grpc/grpc.h>
+
 #include <string>
 #include <utility>
 
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/telemetry/stats.h"
diff --git a/test/core/transport/chttp2/hpack_parser_test.cc b/test/core/transport/chttp2/hpack_parser_test.cc
index 0439490d7c2..1408cf21404 100644
--- a/test/core/transport/chttp2/hpack_parser_test.cc
+++ b/test/core/transport/chttp2/hpack_parser_test.cc
@@ -18,6 +18,12 @@
 
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/grpc.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+
 #include <memory>
 #include <string>
 
@@ -29,13 +35,6 @@
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-#include <grpc/grpc.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
diff --git a/test/core/transport/chttp2/hpack_sync_fuzzer.cc b/test/core/transport/chttp2/hpack_sync_fuzzer.cc
index dff3b687999..efd041392be 100644
--- a/test/core/transport/chttp2/hpack_sync_fuzzer.cc
+++ b/test/core/transport/chttp2/hpack_sync_fuzzer.cc
@@ -26,7 +26,6 @@
 #include "absl/status/status.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
-
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_table.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
diff --git a/test/core/transport/chttp2/hpack_utils_test.cc b/test/core/transport/chttp2/hpack_utils_test.cc
index cf40ca2b564..e44987bf535 100644
--- a/test/core/transport/chttp2/hpack_utils_test.cc
+++ b/test/core/transport/chttp2/hpack_utils_test.cc
@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
 #include <random>
 #include <unordered_map>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder_index.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/chttp2/ping_abuse_policy_test.cc b/test/core/transport/chttp2/ping_abuse_policy_test.cc
index f11e1f268e5..7b0b3c150c6 100644
--- a/test/core/transport/chttp2/ping_abuse_policy_test.cc
+++ b/test/core/transport/chttp2/ping_abuse_policy_test.cc
@@ -14,13 +14,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/ping_abuse_policy.h"
 
+#include <grpc/impl/channel_arg_names.h>
+
 #include <chrono>
 #include <thread>
 
 #include "gtest/gtest.h"
 
-#include <grpc/impl/channel_arg_names.h>
-
 namespace grpc_core {
 namespace {
 
diff --git a/test/core/transport/chttp2/ping_callbacks_test.cc b/test/core/transport/chttp2/ping_callbacks_test.cc
index 18731f4f761..26962c90ada 100644
--- a/test/core/transport/chttp2/ping_callbacks_test.cc
+++ b/test/core/transport/chttp2/ping_callbacks_test.cc
@@ -19,7 +19,6 @@
 #include "absl/random/random.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/event_engine/mock_event_engine.h"
 
diff --git a/test/core/transport/chttp2/ping_configuration_test.cc b/test/core/transport/chttp2/ping_configuration_test.cc
index 30873180124..7b85775466b 100644
--- a/test/core/transport/chttp2/ping_configuration_test.cc
+++ b/test/core/transport/chttp2/ping_configuration_test.cc
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/slice.h>
 
+#include <memory>
+
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/internal.h"
 #include "src/core/ext/transport/chttp2/transport/legacy_frame.h"
diff --git a/test/core/transport/chttp2/ping_rate_policy_test.cc b/test/core/transport/chttp2/ping_rate_policy_test.cc
index 46ddd0501fd..0139212de45 100644
--- a/test/core/transport/chttp2/ping_rate_policy_test.cc
+++ b/test/core/transport/chttp2/ping_rate_policy_test.cc
@@ -18,7 +18,6 @@
 #include <thread>
 
 #include "gtest/gtest.h"
-
 #include "src/core/lib/experiments/experiments.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc
index 291add0aaef..42167462efa 100644
--- a/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc
+++ b/test/core/transport/chttp2/remove_stream_from_stalled_lists_test.cc
@@ -16,6 +16,17 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
+#include <gtest/gtest.h>
 #include <string.h>
 
 #include <algorithm>
@@ -25,23 +36,9 @@
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/flow_control.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/core/transport/chttp2/settings_timeout_test.cc b/test/core/transport/chttp2/settings_timeout_test.cc
index 7e5c5204530..0d6d4037760 100644
--- a/test/core/transport/chttp2/settings_timeout_test.cc
+++ b/test/core/transport/chttp2/settings_timeout_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/atm.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 
 #include <functional>
@@ -30,18 +40,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/atm.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/channel/channel_args_preconditioning.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
diff --git a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
index 178e29de625..a38be490af5 100644
--- a/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
+++ b/test/core/transport/chttp2/stream_leak_with_queued_flow_control_update_test.cc
@@ -12,17 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <inttypes.h>
-#include <string.h>
-
-#include <string>
-
-#include "absl/base/thread_annotations.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "gtest/gtest.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -33,7 +22,16 @@
 #include <grpc/status.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
+#include <inttypes.h>
+#include <string.h>
+
+#include <string>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/util/host_port.h"
diff --git a/test/core/transport/chttp2/streams_not_seen_test.cc b/test/core/transport/chttp2/streams_not_seen_test.cc
index 49a6075cd42..2c435727a54 100644
--- a/test/core/transport/chttp2/streams_not_seen_test.cc
+++ b/test/core/transport/chttp2/streams_not_seen_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/slice_buffer.h>
+#include <grpc/status.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -37,18 +47,6 @@
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/slice_buffer.h>
-#include <grpc/status.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/frame_goaway.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/chttp2/too_many_pings_test.cc b/test/core/transport/chttp2/too_many_pings_test.cc
index 942268fc967..d027d5ea76d 100644
--- a/test/core/transport/chttp2/too_many_pings_test.cc
+++ b/test/core/transport/chttp2/too_many_pings_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpc/byte_buffer.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/impl/channel_arg_names.h>
+#include <grpc/impl/propagation_bits.h>
+#include <grpc/slice.h>
+#include <grpc/status.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <algorithm>
@@ -31,18 +41,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/byte_buffer.h>
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/impl/channel_arg_names.h>
-#include <grpc/impl/propagation_bits.h>
-#include <grpc/slice.h>
-#include <grpc/status.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/time.h>
-
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/core/transport/chttp2/varint_test.cc b/test/core/transport/chttp2/varint_test.cc
index f4848b3167b..d4253270afa 100644
--- a/test/core/transport/chttp2/varint_test.cc
+++ b/test/core/transport/chttp2/varint_test.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/ext/transport/chttp2/transport/varint.h"
 
+#include <grpc/slice.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/slice.h>
-
 #include "test/core/test_util/test_config.h"
 
 template <uint8_t kPrefixBits>
diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index 40a2a653800..288c446f370 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -18,10 +18,9 @@
 
 #include "src/core/lib/transport/connectivity_state.h"
 
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tracer_util.h"
 
diff --git a/test/core/transport/error_utils_test.cc b/test/core/transport/error_utils_test.cc
index c60b4bf5d79..31e7cd108dc 100644
--- a/test/core/transport/error_utils_test.cc
+++ b/test/core/transport/error_utils_test.cc
@@ -22,7 +22,6 @@
 
 #include "absl/status/status.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/status_helper.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/transport/interception_chain_test.cc b/test/core/transport/interception_chain_test.cc
index c2accf5e85b..8b5442a132b 100644
--- a/test/core/transport/interception_chain_test.cc
+++ b/test/core/transport/interception_chain_test.cc
@@ -14,15 +14,14 @@
 
 #include "src/core/lib/transport/interception_chain.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
+
 #include <memory>
 
 #include "absl/log/log.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "test/core/promise/poll_matcher.h"
diff --git a/test/core/transport/metadata_map_test.cc b/test/core/transport/metadata_map_test.cc
index 1e985459a74..817c9f5e986 100644
--- a/test/core/transport/metadata_map_test.cc
+++ b/test/core/transport/metadata_map_test.cc
@@ -14,6 +14,7 @@
 // limitations under the License.
 //
 
+#include <grpc/event_engine/memory_allocator.h>
 #include <stdlib.h>
 
 #include <memory>
@@ -25,9 +26,6 @@
 #include "absl/strings/str_split.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/transport/parsed_metadata_test.cc b/test/core/transport/parsed_metadata_test.cc
index df6bc391f84..391135067cf 100644
--- a/test/core/transport/parsed_metadata_test.cc
+++ b/test/core/transport/parsed_metadata_test.cc
@@ -22,7 +22,6 @@
 #include "absl/strings/numbers.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/transport/metadata_batch.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/transport/promise_endpoint_test.cc b/test/core/transport/promise_endpoint_test.cc
index e6ad3dd2713..a2b7085e5d1 100644
--- a/test/core/transport/promise_endpoint_test.cc
+++ b/test/core/transport/promise_endpoint_test.cc
@@ -16,6 +16,10 @@
 
 // IWYU pragma: no_include <sys/socket.h>
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/port.h>  // IWYU pragma: keep
+#include <grpc/event_engine/slice_buffer.h>
+
 #include <cstring>
 #include <memory>
 #include <string>
@@ -24,11 +28,6 @@
 #include "absl/functional/any_invocable.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/event_engine/port.h>  // IWYU pragma: keep
-#include <grpc/event_engine/slice_buffer.h>
-
 #include "src/core/lib/promise/activity.h"
 #include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/seq.h"
diff --git a/test/core/transport/status_conversion_test.cc b/test/core/transport/status_conversion_test.cc
index 8af76d6a4b2..85055941884 100644
--- a/test/core/transport/status_conversion_test.cc
+++ b/test/core/transport/status_conversion_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/lib/transport/status_conversion.h"
 
+#include <grpc/support/time.h>
+
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/transport/test_suite/call_content.cc b/test/core/transport/test_suite/call_content.cc
index 7c9f26da0f0..84a5f9f1a13 100644
--- a/test/core/transport/test_suite/call_content.cc
+++ b/test/core/transport/test_suite/call_content.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "gmock/gmock.h"
-
 #include "test/core/transport/test_suite/transport_test.h"
 
 using testing::UnorderedElementsAreArray;
diff --git a/test/core/transport/test_suite/chaotic_good_fixture.cc b/test/core/transport/test_suite/chaotic_good_fixture.cc
index 0e87280c086..d36e4b1a054 100644
--- a/test/core/transport/test_suite/chaotic_good_fixture.cc
+++ b/test/core/transport/test_suite/chaotic_good_fixture.cc
@@ -16,7 +16,6 @@
 
 #include "absl/log/check.h"
 #include "gmock/gmock.h"
-
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/ext/transport/chaotic_good/server_transport.h"
 #include "src/core/lib/event_engine/memory_allocator_factory.h"
diff --git a/test/core/transport/test_suite/stress.cc b/test/core/transport/test_suite/stress.cc
index 11f0093ab85..98a2997c1b5 100644
--- a/test/core/transport/test_suite/stress.cc
+++ b/test/core/transport/test_suite/stress.cc
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 #include "absl/random/random.h"
-
 #include "test/core/transport/test_suite/transport_test.h"
 
 namespace grpc_core {
diff --git a/test/core/transport/test_suite/transport_test.h b/test/core/transport/test_suite/transport_test.h
index 97e099f348a..68691c21403 100644
--- a/test/core/transport/test_suite/transport_test.h
+++ b/test/core/transport/test_suite/transport_test.h
@@ -21,7 +21,6 @@
 #include "absl/random/bit_gen_ref.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/transport/transport.h"
 #include "test/core/call/yodel/yodel_test.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
diff --git a/test/core/transport/timeout_encoding_test.cc b/test/core/transport/timeout_encoding_test.cc
index 6de2dcd0398..c1e00b6f680 100644
--- a/test/core/transport/timeout_encoding_test.cc
+++ b/test/core/transport/timeout_encoding_test.cc
@@ -23,7 +23,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/time.h"
 #include "src/core/util/useful.h"
 
diff --git a/test/core/tsi/alts/crypt/aes_gcm_test.cc b/test/core/tsi/alts/crypt/aes_gcm_test.cc
index 93ac19732c4..2d55d756d93 100644
--- a/test/core/tsi/alts/crypt/aes_gcm_test.cc
+++ b/test/core/tsi/alts/crypt/aes_gcm_test.cc
@@ -16,14 +16,12 @@
 //
 //
 
-#include <memory>
-
+#include <grpc/support/alloc.h>
 #include <gtest/gtest.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
diff --git a/test/core/tsi/alts/crypt/gsec_test_util.cc b/test/core/tsi/alts/crypt/gsec_test_util.cc
index 9b6898c3ae7..a6f7209d1a1 100644
--- a/test/core/tsi/alts/crypt/gsec_test_util.cc
+++ b/test/core/tsi/alts/crypt/gsec_test_util.cc
@@ -18,9 +18,8 @@
 
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
 
-#include <time.h>
-
 #include <grpc/support/alloc.h>
+#include <time.h>
 
 void gsec_test_random_bytes(uint8_t* bytes, size_t length) {
   srand(time(nullptr));
diff --git a/test/core/tsi/alts/crypt/gsec_test_util.h b/test/core/tsi/alts/crypt/gsec_test_util.h
index db49b564f4c..4ce88300a18 100644
--- a/test/core/tsi/alts/crypt/gsec_test_util.h
+++ b/test/core/tsi/alts/crypt/gsec_test_util.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_TEST_CORE_TSI_ALTS_CRYPT_GSEC_TEST_UTIL_H
 #define GRPC_TEST_CORE_TSI_ALTS_CRYPT_GSEC_TEST_UTIL_H
 
+#include <grpc/grpc.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <grpc/grpc.h>
-
 ///
 /// This method returns random bytes of certain length.
 ///
diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc
index 1c2c8892e4c..42f6f67ec54 100644
--- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc
+++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.cc
@@ -17,14 +17,6 @@
 //
 #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h"
 
-#include <memory>
-#include <sstream>
-#include <string>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/impl/sync.h>
 #include <grpcpp/security/server_credentials.h>
@@ -33,6 +25,13 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/async_stream.h>
 
+#include <memory>
+#include <sstream>
+#include <string>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 #include "test/core/tsi/alts/fake_handshaker/handshaker.grpc.pb.h"
 #include "test/core/tsi/alts/fake_handshaker/handshaker.pb.h"
diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h
index 2793793d068..6b83b3cbf09 100644
--- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h
+++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H
 #define GRPC_TEST_CORE_TSI_ALTS_FAKE_HANDSHAKER_FAKE_HANDSHAKER_SERVER_H
 
+#include <grpcpp/grpcpp.h>
+
 #include <memory>
 #include <string>
 
-#include <grpcpp/grpcpp.h>
-
 namespace grpc {
 namespace gcp {
 
diff --git a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc
index 4e8df4b23f0..a70f55fdbcc 100644
--- a/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc
+++ b/test/core/tsi/alts/fake_handshaker/fake_handshaker_server_main.cc
@@ -15,15 +15,14 @@
 // limitations under the License.
 //
 //
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/server_builder.h>
+
 #include <sstream>
 
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/fake_handshaker/fake_handshaker_server.h"
diff --git a/test/core/tsi/alts/frame_protector/alts_counter_test.cc b/test/core/tsi/alts/frame_protector/alts_counter_test.cc
index 989530d5e27..2b2961427f3 100644
--- a/test/core/tsi/alts/frame_protector/alts_counter_test.cc
+++ b/test/core/tsi/alts/frame_protector/alts_counter_test.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_counter.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 
 #include "src/core/util/crash.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
diff --git a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc
index 2f834e411b7..cede0ec775d 100644
--- a/test/core/tsi/alts/frame_protector/alts_crypter_test.cc
+++ b/test/core/tsi/alts/frame_protector/alts_crypter_test.cc
@@ -18,18 +18,15 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_crypter.h"
 
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <memory>
 
-#include <gtest/gtest.h>
-
 #include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
-
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
 
 static void alts_crypter_test_random_seal_unseal(alts_crypter* server_seal,
diff --git a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc
index 06b18b7f7ae..f1f4186b37a 100644
--- a/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc
+++ b/test/core/tsi/alts/frame_protector/alts_frame_protector_test.cc
@@ -18,11 +18,9 @@
 
 #include "src/core/tsi/alts/frame_protector/alts_frame_protector.h"
 
-#include <stdbool.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
+#include <stdbool.h>
 
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/test/core/tsi/alts/frame_protector/frame_handler_test.cc b/test/core/tsi/alts/frame_protector/frame_handler_test.cc
index 2784bc0f74b..d9b66e45b1e 100644
--- a/test/core/tsi/alts/frame_protector/frame_handler_test.cc
+++ b/test/core/tsi/alts/frame_protector/frame_handler_test.cc
@@ -18,16 +18,14 @@
 
 #include "src/core/tsi/alts/frame_protector/frame_handler.h"
 
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 
-#include <gtest/gtest.h>
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/useful.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
diff --git a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc
index 0b079ebc88e..baf3ce478b6 100644
--- a/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_concurrent_connectivity_test.cc
@@ -17,6 +17,17 @@
 //
 
 #include <fcntl.h>
+#include <gmock/gmock.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <grpcpp/impl/service_type.h>
+#include <grpcpp/server_builder.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,24 +40,10 @@
 #include <set>
 #include <thread>
 
-#include <gmock/gmock.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/credentials/alts/alts_credentials.h"
 #include "src/core/lib/security/credentials/credentials.h"
diff --git a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc
index 22c42030cb5..8b8a8866a93 100644
--- a/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc
@@ -18,13 +18,10 @@
 
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
 
-#include <gtest/gtest.h>
-
-#include "upb/mem/arena.hpp"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/alts/handshaker/alts_shared_resource.h"
@@ -35,6 +32,7 @@
 #include "src/core/util/env.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "upb/mem/arena.hpp"
 
 #define ALTS_HANDSHAKER_CLIENT_TEST_OUT_FRAME "Hello Google"
 #define ALTS_HANDSHAKER_CLIENT_TEST_TARGET_NAME "bigtable.google.api.com"
diff --git a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
index 3fb9cc715ec..24d949a8b48 100644
--- a/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_tsi_handshaker_test.cc
@@ -18,15 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gtest/gtest.h>
-
-#include "upb/mem/arena.hpp"
-
 #include <grpc/grpc.h>
 #include <grpc/support/sync.h>
+#include <gtest/gtest.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/tsi/alts/handshaker/alts_handshaker_client.h"
@@ -37,6 +33,7 @@
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "upb/mem/arena.hpp"
 
 #define ALTS_TSI_HANDSHAKER_TEST_RECV_BYTES "Hello World"
 #define ALTS_TSI_HANDSHAKER_TEST_OUT_FRAME "Hello Google"
diff --git a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc
index c3286ebcb40..5887d4c856e 100644
--- a/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc
+++ b/test/core/tsi/alts/handshaker/alts_tsi_utils_test.cc
@@ -20,10 +20,9 @@
 
 #include <gtest/gtest.h>
 
-#include "upb/mem/arena.hpp"
-
 #include "test/core/test_util/test_config.h"
 #include "test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.h"
+#include "upb/mem/arena.hpp"
 
 #define ALTS_TSI_UTILS_TEST_OUT_FRAME "Hello Google"
 
diff --git a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc
index 463d90044ba..1294637f95b 100644
--- a/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc
+++ b/test/core/tsi/alts/handshaker/transport_security_common_api_test.cc
@@ -18,12 +18,11 @@
 
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
+#include <gtest/gtest.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <gtest/gtest.h>
-
 const size_t kMaxRpcVersionMajor = 3;
 const size_t kMaxRpcVersionMinor = 2;
 const size_t kMinRpcVersionMajor = 2;
diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc
index 51c08b6cce8..ab27058c606 100644
--- a/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc
+++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol_test.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_record_protocol.h"
 
-#include <memory>
-
+#include <grpc/support/alloc.h>
 #include <gtest/gtest.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc
index 248a496bd27..67d47e0a5cd 100644
--- a/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc
+++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol_test.cc
@@ -18,14 +18,12 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 
-#include <memory>
-
+#include <grpc/support/alloc.h>
 #include <gtest/gtest.h>
 
-#include "absl/types/span.h"
-
-#include <grpc/support/alloc.h>
+#include <memory>
 
+#include "absl/types/span.h"
 #include "test/core/tsi/alts/crypt/gsec_test_util.h"
 
 constexpr size_t kMaxDataSize = 1024;
diff --git a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc
index aaab8c892cf..2bdcabcb1ee 100644
--- a/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc
+++ b/test/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_zero_copy_grpc_protector.h"
 
-#include <gtest/gtest.h>
-
-#include "absl/types/span.h"
-
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 
+#include "absl/types/span.h"
 #include "src/core/tsi/alts/crypt/gsec.h"
 #include "src/core/tsi/alts/zero_copy_frame_protector/alts_iovec_record_protocol.h"
 #include "src/core/tsi/transport_security_grpc.h"
diff --git a/test/core/tsi/crl_ssl_transport_security_test.cc b/test/core/tsi/crl_ssl_transport_security_test.cc
index 0b8d4cf0811..261ea784bab 100644
--- a/test/core/tsi/crl_ssl_transport_security_test.cc
+++ b/test/core/tsi/crl_ssl_transport_security_test.cc
@@ -12,6 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -19,18 +24,10 @@
 #include <memory>
 #include <utility>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/ssl_transport_security.h"
 #include "src/core/tsi/transport_security.h"
diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc
index c61b9a487a7..9a90d7248e4 100644
--- a/test/core/tsi/fake_transport_security_test.cc
+++ b/test/core/tsi/fake_transport_security_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/tsi/fake_transport_security.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <gtest/gtest.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <gtest/gtest.h>
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/tsi/transport_security.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/tsi/ssl_session_cache_test.cc b/test/core/tsi/ssl_session_cache_test.cc
index 61a5f707e93..63630cbb1ae 100644
--- a/test/core/tsi/ssl_session_cache_test.cc
+++ b/test/core/tsi/ssl_session_cache_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h"
 
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <unordered_set>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc
index 228372d86b6..6e2f36c5acf 100644
--- a/test/core/tsi/ssl_transport_security_test.cc
+++ b/test/core/tsi/ssl_transport_security_test.cc
@@ -18,22 +18,19 @@
 
 #include "src/core/tsi/ssl_transport_security.h"
 
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <gtest/gtest.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/tsi/transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/memory.h"
diff --git a/test/core/tsi/ssl_transport_security_utils_test.cc b/test/core/tsi/ssl_transport_security_utils_test.cc
index ac105c42fa5..a8a11d36f5e 100644
--- a/test/core/tsi/ssl_transport_security_utils_test.cc
+++ b/test/core/tsi/ssl_transport_security_utils_test.cc
@@ -16,10 +16,6 @@
 
 #include "src/core/tsi/ssl_transport_security_utils.h"
 
-#include <array>
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include <openssl/bio.h>
@@ -28,12 +24,15 @@
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 
+#include <array>
+#include <string>
+#include <vector>
+
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-
 #include "src/core/lib/slice/slice.h"
 #include "src/core/tsi/transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
diff --git a/test/core/tsi/transport_security_test.cc b/test/core/tsi/transport_security_test.cc
index a0ff0488b93..268d430bee1 100644
--- a/test/core/tsi/transport_security_test.cc
+++ b/test/core/tsi/transport_security_test.cc
@@ -18,19 +18,16 @@
 
 #include "src/core/tsi/transport_security.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <gtest/gtest.h>
+#include <openssl/crypto.h>
 #include <string.h>
 
 #include <string>
 
-#include <gtest/gtest.h>
-#include <openssl/crypto.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/tsi/fake_transport_security.h"
 #include "src/core/tsi/ssl_transport_security.h"
 #include "src/core/util/crash.h"
diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc
index 1239270a0e6..e4508701110 100644
--- a/test/core/tsi/transport_security_test_lib.cc
+++ b/test/core/tsi/transport_security_test_lib.cc
@@ -18,10 +18,8 @@
 
 #include "test/core/tsi/transport_security_test_lib.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
@@ -30,13 +28,12 @@
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "absl/log/check.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/memory.h"
diff --git a/test/core/tsi/transport_security_test_lib.h b/test/core/tsi/transport_security_test_lib.h
index 6e3efec2bff..adce54bda13 100644
--- a/test/core/tsi/transport_security_test_lib.h
+++ b/test/core/tsi/transport_security_test_lib.h
@@ -19,9 +19,8 @@
 #ifndef GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H
 #define GRPC_TEST_CORE_TSI_TRANSPORT_SECURITY_TEST_LIB_H
 
-#include <openssl/x509v3.h>
-
 #include <grpc/support/sync.h>
+#include <openssl/x509v3.h>
 
 #include "src/core/tsi/transport_security_interface.h"
 
diff --git a/test/core/util/alloc_test.cc b/test/core/util/alloc_test.cc
index d8dafc9c727..55bf93fca5c 100644
--- a/test/core/util/alloc_test.cc
+++ b/test/core/util/alloc_test.cc
@@ -16,15 +16,13 @@
 //
 //
 
+#include <grpc/support/alloc.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "test/core/test_util/test_config.h"
 
 TEST(AllocTest, MallocAligned) {
diff --git a/test/core/util/backoff_test.cc b/test/core/util/backoff_test.cc
index 3ee1cf7fe21..4cd5e6490e5 100644
--- a/test/core/util/backoff_test.cc
+++ b/test/core/util/backoff_test.cc
@@ -18,14 +18,13 @@
 
 #include "src/core/util/backoff.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/time.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/chunked_vector_fuzzer.cc b/test/core/util/chunked_vector_fuzzer.cc
index 37bcc3df4e1..6c2d642886d 100644
--- a/test/core/util/chunked_vector_fuzzer.cc
+++ b/test/core/util/chunked_vector_fuzzer.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/event_engine/memory_allocator.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ -21,9 +22,6 @@
 #include <vector>
 
 #include "absl/log/check.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/core/util/chunked_vector_test.cc b/test/core/util/chunked_vector_test.cc
index 82f10436edc..8dbb680c1dc 100644
--- a/test/core/util/chunked_vector_test.cc
+++ b/test/core/util/chunked_vector_test.cc
@@ -14,13 +14,12 @@
 
 #include "src/core/util/chunked_vector.h"
 
+#include <grpc/event_engine/memory_allocator.h>
+
 #include <algorithm>
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/event_engine/memory_allocator.h>
-
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/util/cpp_impl_of_test.cc b/test/core/util/cpp_impl_of_test.cc
index 49653bee36b..ef1e9a60eb7 100644
--- a/test/core/util/cpp_impl_of_test.cc
+++ b/test/core/util/cpp_impl_of_test.cc
@@ -14,10 +14,10 @@
 
 #include "src/core/util/cpp_impl_of.h"
 
-#include <memory>
-
 #include <gtest/gtest.h>
 
+#include <memory>
+
 typedef struct grpc_foo grpc_foo;
 
 namespace grpc_core {
diff --git a/test/core/util/cpu_test.cc b/test/core/util/cpu_test.cc
index 1c480304f47..00bc201cacd 100644
--- a/test/core/util/cpu_test.cc
+++ b/test/core/util/cpu_test.cc
@@ -21,6 +21,10 @@
 // gpr_cpu_current_cpu()
 //
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,12 +32,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/directory_reader_test.cc b/test/core/util/directory_reader_test.cc
index e117bc2b058..57022e69689 100644
--- a/test/core/util/directory_reader_test.cc
+++ b/test/core/util/directory_reader_test.cc
@@ -22,7 +22,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 static constexpr absl::string_view kCrlDirectory =
diff --git a/test/core/util/dual_ref_counted_test.cc b/test/core/util/dual_ref_counted_test.cc
index 4c9e2de162f..150fd39c03b 100644
--- a/test/core/util/dual_ref_counted_test.cc
+++ b/test/core/util/dual_ref_counted_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/manual_constructor.h"
 #include "src/core/util/ref_counted.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/util/env_test.cc b/test/core/util/env_test.cc
index df82aa37752..2b497db9106 100644
--- a/test/core/util/env_test.cc
+++ b/test/core/util/env_test.cc
@@ -20,7 +20,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 TEST(EnvTest, SetenvGetenv) {
diff --git a/test/core/util/fork_test.cc b/test/core/util/fork_test.cc
index 543c00da713..cce0af99e0b 100644
--- a/test/core/util/fork_test.cc
+++ b/test/core/util/fork_test.cc
@@ -18,12 +18,10 @@
 
 #include "src/core/util/fork.h"
 
+#include <grpc/support/time.h>
 #include <stdint.h>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/glob_test.cc b/test/core/util/glob_test.cc
index 84df18db721..284464f395a 100644
--- a/test/core/util/glob_test.cc
+++ b/test/core/util/glob_test.cc
@@ -14,11 +14,10 @@
 
 #include "src/core/util/glob.h"
 
-#include "absl/strings/match.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 
+#include "absl/strings/match.h"
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/gpr_time_test.cc b/test/core/util/gpr_time_test.cc
index 48ea2ce17a2..9ae5d0ed7fb 100644
--- a/test/core/util/gpr_time_test.cc
+++ b/test/core/util/gpr_time_test.cc
@@ -18,6 +18,7 @@
 
 // Test of gpr time support.
 
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
@@ -25,9 +26,6 @@
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/time.h>
-
 #include "test/core/test_util/test_config.h"
 
 static void to_fp(void* arg, const char* buf, size_t len) {
diff --git a/test/core/util/host_port_test.cc b/test/core/util/host_port_test.cc
index 3f7607c0a56..9845d54b203 100644
--- a/test/core/util/host_port_test.cc
+++ b/test/core/util/host_port_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/util/host_port.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 static void join_host_port_expect(const char* host, int port,
diff --git a/test/core/util/load_file_test.cc b/test/core/util/load_file_test.cc
index 4888749fb40..2c83b2a119b 100644
--- a/test/core/util/load_file_test.cc
+++ b/test/core/util/load_file_test.cc
@@ -14,15 +14,13 @@
 
 #include "src/core/util/load_file.h"
 
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <cstdint>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/tmpfile.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/mpscq_test.cc b/test/core/util/mpscq_test.cc
index 65dce481d43..a0c304ead05 100644
--- a/test/core/util/mpscq_test.cc
+++ b/test/core/util/mpscq_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/util/mpscq.h"
 
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -25,10 +27,6 @@
 
 #include "absl/log/log.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "src/core/util/useful.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/util/orphanable_test.cc b/test/core/util/orphanable_test.cc
index 4e38d719d9c..4d21829ad47 100644
--- a/test/core/util/orphanable_test.cc
+++ b/test/core/util/orphanable_test.cc
@@ -19,7 +19,6 @@
 #include "src/core/util/orphanable.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/ref_counted_ptr_test.cc b/test/core/util/ref_counted_ptr_test.cc
index e2d7cd0f4db..3271aa4b107 100644
--- a/test/core/util/ref_counted_ptr_test.cc
+++ b/test/core/util/ref_counted_ptr_test.cc
@@ -23,7 +23,6 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/dual_ref_counted.h"
 #include "src/core/util/ref_counted.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/util/ref_counted_test.cc b/test/core/util/ref_counted_test.cc
index 5b0171d3b4f..2769aec600d 100644
--- a/test/core/util/ref_counted_test.cc
+++ b/test/core/util/ref_counted_test.cc
@@ -25,7 +25,6 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/ring_buffer_test.cc b/test/core/util/ring_buffer_test.cc
index 808018d0538..7c176eabfe2 100644
--- a/test/core/util/ring_buffer_test.cc
+++ b/test/core/util/ring_buffer_test.cc
@@ -18,10 +18,10 @@
 
 #include "src/core/util/ring_buffer.h"
 
-#include "gtest/gtest.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "gtest/gtest.h"
+
 namespace grpc_core {
 
 constexpr int kBufferCapacity = 1000;
diff --git a/test/core/util/spinlock_test.cc b/test/core/util/spinlock_test.cc
index da7c4b4ca57..35eb6a42488 100644
--- a/test/core/util/spinlock_test.cc
+++ b/test/core/util/spinlock_test.cc
@@ -20,16 +20,14 @@
 
 #include "src/core/util/spinlock.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/stat_test.cc b/test/core/util/stat_test.cc
index 4595a6208bd..3c8ad0e5bd5 100644
--- a/test/core/util/stat_test.cc
+++ b/test/core/util/stat_test.cc
@@ -16,14 +16,12 @@
 
 #include "src/core/util/stat.h"
 
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/tmpfile.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/string_test.cc b/test/core/util/string_test.cc
index 4ca644d8090..7ba0c920c94 100644
--- a/test/core/util/string_test.cc
+++ b/test/core/util/string_test.cc
@@ -18,15 +18,13 @@
 
 #include "src/core/util/string.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
 #include <limits.h>
 #include <stddef.h>
 #include <string.h>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "test/core/test_util/test_config.h"
 
 TEST(StringTest, Strdup) {
diff --git a/test/core/util/sync_test.cc b/test/core/util/sync_test.cc
index 256664302e2..c29b086d1b0 100644
--- a/test/core/util/sync_test.cc
+++ b/test/core/util/sync_test.cc
@@ -18,17 +18,15 @@
 
 // Test of gpr synchronization support.
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stdint.h>
 #include <stdio.h>
 
 #include <memory>
 
 #include "gtest/gtest.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/util/thd.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/util/thd_test.cc b/test/core/util/thd_test.cc
index fd93eb278d3..993b6d5ab62 100644
--- a/test/core/util/thd_test.cc
+++ b/test/core/util/thd_test.cc
@@ -20,13 +20,12 @@
 
 #include "src/core/util/thd.h"
 
-#include <atomic>
-
-#include "gtest/gtest.h"
-
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 
+#include <atomic>
+
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 #define NUM_THREADS 100
diff --git a/test/core/util/time_averaged_stats_test.cc b/test/core/util/time_averaged_stats_test.cc
index f42f27e3353..2806915dbaf 100644
--- a/test/core/util/time_averaged_stats_test.cc
+++ b/test/core/util/time_averaged_stats_test.cc
@@ -18,9 +18,8 @@
 
 #include "src/core/util/time_averaged_stats.h"
 
-#include <math.h>
-
 #include <gtest/gtest.h>
+#include <math.h>
 
 namespace grpc_core {
 namespace {
diff --git a/test/core/util/time_util_test.cc b/test/core/util/time_util_test.cc
index 749a6f26ec0..85a1558befb 100644
--- a/test/core/util/time_util_test.cc
+++ b/test/core/util/time_util_test.cc
@@ -16,14 +16,14 @@
 
 #include "src/core/util/time_util.h"
 
+#include <grpc/support/time.h>
+
 #include <algorithm>
 #include <vector>
 
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
 
-#include <grpc/support/time.h>
-
 TEST(TimeUtilTest, ToGprTimeSpecFromAbslDurationWithRegularValues) {
   std::vector<int> times = {-10, -1, 0, 1, 10};
   for (int t : times) {
diff --git a/test/core/util/unique_ptr_with_bitset_test.cc b/test/core/util/unique_ptr_with_bitset_test.cc
index e5b67a36ff9..16cf91d0252 100644
--- a/test/core/util/unique_ptr_with_bitset_test.cc
+++ b/test/core/util/unique_ptr_with_bitset_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/util/unique_ptr_with_bitset.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <limits>
@@ -25,8 +26,6 @@
 
 #include "gtest/gtest.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 TEST(UniquePtrWithBitsetTest, Basic) {
diff --git a/test/core/util/uri_fuzzer_test.cc b/test/core/util/uri_fuzzer_test.cc
index dd4b1c0f861..0b0c689d5ab 100644
--- a/test/core/util/uri_fuzzer_test.cc
+++ b/test/core/util/uri_fuzzer_test.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <stdint.h>
-#include <string.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
+#include <stdint.h>
+#include <string.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/uri.h"
diff --git a/test/core/util/uri_test.cc b/test/core/util/uri_test.cc
index 965d208ae7c..0719b1e5ba2 100644
--- a/test/core/util/uri_test.cc
+++ b/test/core/util/uri_test.cc
@@ -16,14 +16,13 @@
 
 #include "src/core/util/uri.h"
 
+#include <grpc/grpc.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "test/core/test_util/test_config.h"
 
 using ::testing::ContainerEq;
diff --git a/test/core/util/useful_test.cc b/test/core/util/useful_test.cc
index 506b2da3040..8efecba0adb 100644
--- a/test/core/util/useful_test.cc
+++ b/test/core/util/useful_test.cc
@@ -18,6 +18,7 @@
 
 #include "src/core/util/useful.h"
 
+#include <grpc/support/port_platform.h>
 #include <stdint.h>
 
 #include <limits>
@@ -25,8 +26,6 @@
 
 #include "gtest/gtest.h"
 
-#include <grpc/support/port_platform.h>
-
 namespace grpc_core {
 
 TEST(UsefulTest, ClampWorks) {
diff --git a/test/core/util/validation_errors_test.cc b/test/core/util/validation_errors_test.cc
index e3222408d2e..8423736f3bd 100644
--- a/test/core/util/validation_errors_test.cc
+++ b/test/core/util/validation_errors_test.cc
@@ -17,7 +17,6 @@
 #include "src/core/util/validation_errors.h"
 
 #include "gtest/gtest.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc_core {
diff --git a/test/core/util/work_serializer_test.cc b/test/core/util/work_serializer_test.cc
index 773255725bb..e32a83bf31d 100644
--- a/test/core/util/work_serializer_test.cc
+++ b/test/core/util/work_serializer_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/core/util/work_serializer.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <stddef.h>
 
 #include <memory>
@@ -30,11 +33,6 @@
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc
index a0b76e521fb..e486fd33dc6 100644
--- a/test/core/xds/certificate_provider_store_test.cc
+++ b/test/core/xds/certificate_provider_store_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/core/xds/grpc/certificate_provider_store.h"
 
+#include <grpc/grpc.h>
+
 #include <algorithm>
 #include <memory>
 #include <thread>
@@ -25,9 +27,6 @@
 
 #include "absl/log/check.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/unique_type_name.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/core/xds/file_watcher_certificate_provider_factory_test.cc b/test/core/xds/file_watcher_certificate_provider_factory_test.cc
index f0eda5d3f55..581a10db148 100644
--- a/test/core/xds/file_watcher_certificate_provider_factory_test.cc
+++ b/test/core/xds/file_watcher_certificate_provider_factory_test.cc
@@ -18,15 +18,14 @@
 
 #include "src/core/xds/grpc/file_watcher_certificate_provider_factory.h"
 
+#include <grpc/grpc.h>
+
 #include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/json/json_reader.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/core/xds/xds_audit_logger_registry_test.cc b/test/core/xds/xds_audit_logger_registry_test.cc
index 1d673ff7302..5b10e99abf8 100644
--- a/test/core/xds/xds_audit_logger_registry_test.cc
+++ b/test/core/xds/xds_audit_logger_registry_test.cc
@@ -18,11 +18,13 @@
 
 #include "src/core/xds/grpc/xds_audit_logger_registry.h"
 
+#include <google/protobuf/any.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_audit_logging.h>
+
 #include <memory>
 #include <string>
 
-#include <google/protobuf/any.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
@@ -30,12 +32,6 @@
 #include "envoy/config/rbac/v3/rbac.upb.h"
 #include "google/protobuf/struct.pb.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_audit_logging.h>
-
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json.h"
@@ -46,6 +42,8 @@
 #include "src/proto/grpc/testing/xds/v3/rbac.pb.h"
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 namespace testing {
diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc
index cc77846ae13..45dbfefdf4e 100644
--- a/test/core/xds/xds_bootstrap_test.cc
+++ b/test/core/xds/xds_bootstrap_test.cc
@@ -16,6 +16,10 @@
 
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/grpc_security_constants.h>
+#include <grpc/support/alloc.h>
 #include <stdio.h>
 
 #include <map>
@@ -29,12 +33,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/grpc_security_constants.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 #include "src/core/lib/security/credentials/channel_creds_registry.h"
diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc
index a81e03421e8..0d5acb72bd0 100644
--- a/test/core/xds/xds_certificate_provider_test.cc
+++ b/test/core/xds/xds_certificate_provider_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/core/xds/grpc/xds_certificate_provider.h"
 
+#include <grpc/grpc.h>
+
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/core/util/status_helper.h"
diff --git a/test/core/xds/xds_client_fuzzer.cc b/test/core/xds/xds_client_fuzzer.cc
index 158563429e8..cc8ebc4f0be 100644
--- a/test/core/xds/xds_client_fuzzer.cc
+++ b/test/core/xds/xds_client_fuzzer.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <grpc/grpc.h>
+
 #include <map>
 #include <memory>
 #include <set>
@@ -27,9 +29,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc
index c28966f2c23..36ddd7e47a2 100644
--- a/test/core/xds/xds_client_test.cc
+++ b/test/core/xds/xds_client_test.cc
@@ -20,6 +20,11 @@
 
 #include "src/core/xds/xds_client/xds_client.h"
 
+#include <google/protobuf/any.pb.h>
+#include <google/protobuf/struct.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -31,21 +36,12 @@
 #include <string>
 #include <vector>
 
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/struct.pb.h>
-
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/reflection/def.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/util/debug_location.h"
 #include "src/core/util/json/json.h"
@@ -65,6 +61,7 @@
 #include "test/core/test_util/test_config.h"
 #include "test/core/xds/xds_client_test_peer.h"
 #include "test/core/xds/xds_transport_fake.h"
+#include "upb/reflection/def.h"
 
 // IWYU pragma: no_include <google/protobuf/message.h>
 // IWYU pragma: no_include <google/protobuf/stubs/status.h>
diff --git a/test/core/xds/xds_client_test_peer.h b/test/core/xds/xds_client_test_peer.h
index 9c3bfa61f41..d65b9763748 100644
--- a/test/core/xds/xds_client_test_peer.h
+++ b/test/core/xds/xds_client_test_peer.h
@@ -17,13 +17,12 @@
 #ifndef GRPC_TEST_CORE_XDS_XDS_CLIENT_TEST_PEER_H
 #define GRPC_TEST_CORE_XDS_XDS_CLIENT_TEST_PEER_H
 
+#include <grpc/support/port_platform.h>
+
 #include <set>
 
 #include "absl/functional/function_ref.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/xds/xds_client/xds_client.h"
 
 namespace grpc_core {
diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc
index 804241913e8..8be6ab83171 100644
--- a/test/core/xds/xds_cluster_resource_type_test.cc
+++ b/test/core/xds/xds_cluster_resource_type_test.cc
@@ -14,14 +14,15 @@
 // limitations under the License.
 //
 
-#include <memory>
-#include <string>
-#include <utility>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/struct.pb.h>
 #include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
+#include <memory>
+#include <string>
+#include <utility>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
@@ -30,11 +31,6 @@
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/load_balancing/outlier_detection/outlier_detection.h"
@@ -68,6 +64,8 @@
 #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::cluster::v3::Cluster;
 using envoy::extensions::clusters::aggregate::v3::ClusterConfig;
diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc
index 45ac7574b75..2877e621f66 100644
--- a/test/core/xds/xds_common_types_test.cc
+++ b/test/core/xds/xds_common_types_test.cc
@@ -16,14 +16,15 @@
 
 #include "src/core/xds/grpc/xds_common_types.h"
 
+#include <google/protobuf/struct.pb.h>
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/struct.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
@@ -33,11 +34,6 @@
 #include "google/protobuf/duration.upb.h"
 #include "gtest/gtest.h"
 #include "re2/re2.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json_writer.h"
@@ -59,6 +55,8 @@
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/util/config_grpc_cli.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using CommonTlsContextProto =
     envoy::extensions::transport_sockets::tls::v3::CommonTlsContext;
diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc
index 8e9da777bc2..af6f708a558 100644
--- a/test/core/xds/xds_endpoint_resource_type_test.cc
+++ b/test/core/xds/xds_endpoint_resource_type_test.cc
@@ -14,6 +14,8 @@
 // limitations under the License.
 //
 
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
 #include <stdint.h>
 
 #include <limits>
@@ -23,18 +25,11 @@
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
@@ -58,6 +53,8 @@
 #include "src/proto/grpc/testing/xds/v3/percent.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::endpoint::v3::ClusterLoadAssignment;
 
diff --git a/test/core/xds/xds_http_filters_test.cc b/test/core/xds/xds_http_filters_test.cc
index c5a76d01ee2..b32b536bc91 100644
--- a/test/core/xds/xds_http_filters_test.cc
+++ b/test/core/xds/xds_http_filters_test.cc
@@ -14,13 +14,17 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+#include <grpc/support/json.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
+
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/log/check.h"
 #include "absl/status/status.h"
@@ -28,14 +32,6 @@
 #include "absl/strings/strip.h"
 #include "absl/types/variant.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-#include <grpc/support/json.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h"
@@ -73,6 +69,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 // IWYU pragma: no_include <google/protobuf/message.h>
 
diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc
index 34f516e84ef..d50e00c6312 100644
--- a/test/core/xds/xds_lb_policy_registry_test.cc
+++ b/test/core/xds/xds_lb_policy_registry_test.cc
@@ -18,22 +18,18 @@
 
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
 
-#include <string>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/duration.pb.h>
 #include <google/protobuf/struct.pb.h>
 #include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
+#include <string>
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
@@ -52,6 +48,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 namespace grpc_core {
 namespace testing {
diff --git a/test/core/xds/xds_listener_resource_type_test.cc b/test/core/xds/xds_listener_resource_type_test.cc
index 0f3f815faf9..24cbf01ce11 100644
--- a/test/core/xds/xds_listener_resource_type_test.cc
+++ b/test/core/xds/xds_listener_resource_type_test.cc
@@ -14,16 +14,17 @@
 // limitations under the License.
 //
 
+#include <google/protobuf/any.pb.h>
+#include <google/protobuf/duration.pb.h>
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -33,11 +34,6 @@
 #include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
@@ -67,6 +63,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::listener::v3::Listener;
 using envoy::extensions::filters::http::fault::v3::HTTPFault;
diff --git a/test/core/xds/xds_metadata_test.cc b/test/core/xds/xds_metadata_test.cc
index 76769ea1b70..4cdfe1fa351 100644
--- a/test/core/xds/xds_metadata_test.cc
+++ b/test/core/xds/xds_metadata_test.cc
@@ -16,18 +16,17 @@
 
 #include "src/core/xds/grpc/xds_metadata.h"
 
-#include <string>
-#include <utility>
-
 #include <google/protobuf/any.pb.h>
 #include <google/protobuf/struct.pb.h>
 
+#include <string>
+#include <utility>
+
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
 #include "src/core/lib/debug/trace.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/json/json.h"
diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc
index 61311226c52..9493ef58354 100644
--- a/test/core/xds/xds_route_config_resource_type_test.cc
+++ b/test/core/xds/xds_route_config_resource_type_test.cc
@@ -14,6 +14,11 @@
 // limitations under the License.
 //
 
+#include <google/protobuf/any.pb.h>
+#include <google/protobuf/duration.pb.h>
+#include <google/protobuf/wrappers.pb.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
 #include <stdint.h>
 
 #include <limits>
@@ -23,10 +28,6 @@
 #include <utility>
 #include <vector>
 
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -37,12 +38,6 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "re2/re2.h"
-#include "upb/mem/arena.hpp"
-#include "upb/reflection/def.hpp"
-
-#include <grpc/grpc.h>
-#include <grpc/status.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/error.h"
@@ -69,6 +64,8 @@
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
+#include "upb/reflection/def.hpp"
 
 using envoy::config::route::v3::RouteConfiguration;
 using grpc::lookup::v1::RouteLookupClusterSpecifier;
diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc
index 6369fd60c97..c56124c12ed 100644
--- a/test/core/xds/xds_transport_fake.cc
+++ b/test/core/xds/xds_transport_fake.cc
@@ -16,6 +16,9 @@
 
 #include "test/core/xds/xds_transport_fake.h"
 
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
+
 #include <functional>
 #include <memory>
 #include <string>
@@ -25,10 +28,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h
index ffa4c746551..6a4a3d967b2 100644
--- a/test/core/xds/xds_transport_fake.h
+++ b/test/core/xds/xds_transport_fake.h
@@ -17,6 +17,7 @@
 #ifndef GRPC_TEST_CORE_XDS_XDS_TRANSPORT_FAKE_H
 #define GRPC_TEST_CORE_XDS_XDS_TRANSPORT_FAKE_H
 
+#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <deque>
@@ -31,9 +32,6 @@
 #include "absl/strings/string_view.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted.h"
 #include "src/core/util/ref_counted_ptr.h"
diff --git a/test/cpp/client/credentials_test.cc b/test/cpp/client/credentials_test.cc
index 866fe098f94..8f81b956775 100644
--- a/test/cpp/client/credentials_test.cc
+++ b/test/cpp/client/credentials_test.cc
@@ -16,13 +16,7 @@
 //
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
@@ -30,7 +24,11 @@
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
 #include "src/core/util/env.h"
 #include "src/core/util/tmpfile.h"
 #include "src/cpp/client/secure_credentials.h"
diff --git a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
index c2777262475..85407fd9afb 100644
--- a/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
+++ b/test/cpp/client/destroy_grpclb_channel_with_active_connect_stress_test.cc
@@ -16,15 +16,7 @@
 //
 //
 
-#include <atomic>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <sstream>
-#include <thread>
-
 #include <gmock/gmock.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
@@ -36,6 +28,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
+#include <atomic>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <sstream>
+#include <thread>
+
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/sockaddr.h"
diff --git a/test/cpp/codegen/codegen_test_full.cc b/test/cpp/codegen/codegen_test_full.cc
index b27e1b5fc5d..7ccdd02d690 100644
--- a/test/cpp/codegen/codegen_test_full.cc
+++ b/test/cpp/codegen/codegen_test_full.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/support/time.h>
 #include <grpcpp/completion_queue.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/codegen/golden_file_test.cc b/test/cpp/codegen/golden_file_test.cc
index 5c45db77f7e..ec3550a6d3b 100644
--- a/test/cpp/codegen/golden_file_test.cc
+++ b/test/cpp/codegen/golden_file_test.cc
@@ -16,13 +16,12 @@
 //
 //
 
+#include <gtest/gtest.h>
+
 #include <fstream>
 #include <sstream>
 
-#include <gtest/gtest.h>
-
 #include "absl/flags/flag.h"
-
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/util/test_config.h"
 
diff --git a/test/cpp/codegen/proto_utils_test.cc b/test/cpp/codegen/proto_utils_test.cc
index 1a95bee1f8e..fccde1da362 100644
--- a/test/cpp/codegen/proto_utils_test.cc
+++ b/test/cpp/codegen/proto_utils_test.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/byte_buffer.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/impl/proto_utils.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/common/alarm_test.cc b/test/cpp/common/alarm_test.cc
index 63eb170dfc1..15161fa2b31 100644
--- a/test/cpp/common/alarm_test.cc
+++ b/test/cpp/common/alarm_test.cc
@@ -16,16 +16,15 @@
 //
 //
 
+#include <grpcpp/alarm.h>
+#include <grpcpp/completion_queue.h>
+#include <gtest/gtest.h>
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <thread>
 
-#include <gtest/gtest.h>
-
-#include <grpcpp/alarm.h>
-#include <grpcpp/completion_queue.h>
-
 #include "src/core/util/notification.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc
index 5fe52338ff4..7bb3f3bf9de 100644
--- a/test/cpp/common/alts_util_test.cc
+++ b/test/cpp/common/alts_util_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <gtest/gtest.h>
-
-#include "upb/mem/arena.hpp"
-
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/alts_util.h>
 #include <grpcpp/security/auth_context.h>
+#include <gtest/gtest.h>
 
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 #include "src/cpp/common/secure_auth_context.h"
 #include "src/proto/grpc/gcp/altscontext.upb.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/util/string_ref_helper.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace {
diff --git a/test/cpp/common/auth_property_iterator_test.cc b/test/cpp/common/auth_property_iterator_test.cc
index 7d72a344344..f8c08a90ff9 100644
--- a/test/cpp/common/auth_property_iterator_test.cc
+++ b/test/cpp/common/auth_property_iterator_test.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/context/security_context.h"
 #include "src/cpp/common/secure_auth_context.h"
diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc
index a6c7167d25e..0857154685c 100644
--- a/test/cpp/common/channel_arguments_test.cc
+++ b/test/cpp/common/channel_arguments_test.cc
@@ -16,11 +16,10 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/channel_arguments.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
diff --git a/test/cpp/common/secure_auth_context_test.cc b/test/cpp/common/secure_auth_context_test.cc
index ca50902377f..719281f9ede 100644
--- a/test/cpp/common/secure_auth_context_test.cc
+++ b/test/cpp/common/secure_auth_context_test.cc
@@ -18,10 +18,9 @@
 
 #include "src/cpp/common/secure_auth_context.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/auth_context.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/security/context/security_context.h"
 #include "test/cpp/util/string_ref_helper.h"
diff --git a/test/cpp/common/time_jump_test.cc b/test/cpp/common/time_jump_test.cc
index e1593a59daa..f8a0abef634 100644
--- a/test/cpp/common/time_jump_test.cc
+++ b/test/cpp/common/time_jump_test.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <gtest/gtest.h>
 #include <spawn.h>
 
 #include <sstream>
@@ -23,14 +25,9 @@
 #include <thread>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/common/timer_test.cc b/test/cpp/common/timer_test.cc
index e3f2a31c1dd..a656e509448 100644
--- a/test/cpp/common/timer_test.cc
+++ b/test/cpp/common/timer_test.cc
@@ -18,13 +18,11 @@
 
 #include "src/core/lib/iomgr/timer.h"
 
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/end2end/admin_services_end2end_test.cc b/test/cpp/end2end/admin_services_end2end_test.cc
index 95fae195c06..83615c2df22 100644
--- a/test/cpp/end2end/admin_services_end2end_test.cc
+++ b/test/cpp/end2end/admin_services_end2end_test.cc
@@ -17,14 +17,12 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_cat.h"
-
 #include <grpcpp/ext/admin_services.h>
 #include <grpcpp/ext/proto_server_reflection_plugin.h>
 #include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
 
+#include "absl/strings/str_cat.h"
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc
index 0f59bcab892..22b46c08f14 100644
--- a/test/cpp/end2end/async_end2end_test.cc
+++ b/test/cpp/end2end/async_end2end_test.cc
@@ -16,16 +16,6 @@
 //
 //
 
-#include <cinttypes>
-#include <memory>
-#include <thread>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -37,6 +27,15 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <cinttypes>
+#include <memory>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/port.h"
diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc
index c0139db761f..cba2e4f7ddd 100644
--- a/test/cpp/end2end/cfstream_test.cc
+++ b/test/cpp/end2end/cfstream_test.cc
@@ -16,17 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/atm.h>
@@ -38,7 +27,16 @@
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc
index 708b4ff53f9..34a89831904 100644
--- a/test/cpp/end2end/channelz_service_test.cc
+++ b/test/cpp/end2end/channelz_service_test.cc
@@ -17,11 +17,6 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
@@ -34,7 +29,10 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc
index fefcc81a976..1df284f3b66 100644
--- a/test/cpp/end2end/client_callback_end2end_test.cc
+++ b/test/cpp/end2end/client_callback_end2end_test.cc
@@ -16,19 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <condition_variable>
-#include <functional>
-#include <mutex>
-#include <sstream>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -38,7 +25,18 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/client_callback.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+#include <sstream>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/client_crash_test.cc b/test/cpp/end2end/client_crash_test.cc
index 39e857562c8..ba3a2414e35 100644
--- a/test/cpp/end2end/client_crash_test.cc
+++ b/test/cpp/end2end/client_crash_test.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -29,7 +24,10 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/client_crash_test_server.cc b/test/cpp/end2end/client_crash_test_server.cc
index 6d166740ee2..517889f4f68 100644
--- a/test/cpp/end2end/client_crash_test_server.cc
+++ b/test/cpp/end2end/client_crash_test_server.cc
@@ -16,17 +16,16 @@
 //
 //
 
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <iostream>
 #include <memory>
 #include <string>
 
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/end2end/client_fork_test.cc b/test/cpp/end2end/client_fork_test.cc
index c93ff755e83..c004f0d79be 100644
--- a/test/cpp/end2end/client_fork_test.cc
+++ b/test/cpp/end2end/client_fork_test.cc
@@ -19,13 +19,6 @@
 int main(int /* argc */, char** /* argv */) { return 0; }
 #else  // GRPC_ENABLE_FORK_SUPPORT
 
-#include <signal.h>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
@@ -35,7 +28,11 @@ int main(int /* argc */, char** /* argv */) { return 0; }
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+#include <signal.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/util/fork.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/client_interceptors_end2end_test.cc b/test/cpp/end2end/client_interceptors_end2end_test.cc
index 812e529dd66..4a17aa0833e 100644
--- a/test/cpp/end2end/client_interceptors_end2end_test.cc
+++ b/test/cpp/end2end/client_interceptors_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -35,7 +27,13 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/server_posix.h>
 #include <grpcpp/support/client_interceptor.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc
index 0b7349ceb26..a72c77b319f 100644
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@@ -12,27 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <algorithm>
-#include <chrono>
-#include <deque>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <set>
-#include <string>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-#include "absl/strings/string_view.h"
-
 #include <grpc/event_engine/endpoint_config.h>
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
@@ -48,7 +28,25 @@
 #include <grpcpp/impl/sync.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <algorithm>
+#include <chrono>
+#include <deque>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <set>
+#include <string>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/client_channel/config_selector.h"
 #include "src/core/client_channel/global_subchannel_pool.h"
diff --git a/test/cpp/end2end/connection_attempt_injector.cc b/test/cpp/end2end/connection_attempt_injector.cc
index a7b64bfcea3..c87b73b5666 100644
--- a/test/cpp/end2end/connection_attempt_injector.cc
+++ b/test/cpp/end2end/connection_attempt_injector.cc
@@ -20,7 +20,6 @@
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/utility/utility.h"
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/end2end/context_allocator_end2end_test.cc b/test/cpp/end2end/context_allocator_end2end_test.cc
index 6b9b7a355e7..a70ad1f2f53 100644
--- a/test/cpp/end2end/context_allocator_end2end_test.cc
+++ b/test/cpp/end2end/context_allocator_end2end_test.cc
@@ -16,6 +16,16 @@
 //
 //
 
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
@@ -25,20 +35,8 @@
 #include <sstream>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc
index c8e332b0a12..3ea440294f3 100644
--- a/test/cpp/end2end/crl_provider_test.cc
+++ b/test/cpp/end2end/crl_provider_test.cc
@@ -15,19 +15,6 @@
 // limitations under the License.
 //
 //
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
@@ -42,7 +29,18 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <string>
+#include <vector>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "absl/synchronization/notification.h"
 #include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/delegating_channel_test.cc b/test/cpp/end2end/delegating_channel_test.cc
index d675b2bdc8e..019e98be05e 100644
--- a/test/cpp/end2end/delegating_channel_test.cc
+++ b/test/cpp/end2end/delegating_channel_test.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -31,6 +26,10 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/client_interceptor.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <vector>
 
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 1bf43444442..818a643b089 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -16,16 +16,6 @@
 //
 //
 
-#include <mutex>
-#include <thread>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/ascii.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -42,6 +32,15 @@
 #include <grpcpp/support/string_ref.h>
 #include <grpcpp/test/channel_test_peer.h>
 
+#include <mutex>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/ascii.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_format.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/iomgr/iomgr.h"
diff --git a/test/cpp/end2end/exception_test.cc b/test/cpp/end2end/exception_test.cc
index d5fa8424b27..395b29b506f 100644
--- a/test/cpp/end2end/exception_test.cc
+++ b/test/cpp/end2end/exception_test.cc
@@ -16,17 +16,16 @@
 //
 //
 
-#include <exception>
-#include <memory>
-
-#include <gtest/gtest.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <exception>
+#include <memory>
 
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/flaky_network_test.cc b/test/cpp/end2end/flaky_network_test.cc
index 3df6f1e080f..58415f620d5 100644
--- a/test/cpp/end2end/flaky_network_test.cc
+++ b/test/cpp/end2end/flaky_network_test.cc
@@ -16,18 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/atm.h>
@@ -40,7 +28,17 @@
 #include <grpcpp/health_check_service_interface.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <algorithm>
+#include <condition_variable>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <thread>
+
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
 #include "src/core/util/backoff.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/generic_end2end_test.cc b/test/cpp/end2end/generic_end2end_test.cc
index c853a0bf257..cf933fd107c 100644
--- a/test/cpp/end2end/generic_end2end_test.cc
+++ b/test/cpp/end2end/generic_end2end_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <memory>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -35,7 +28,12 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/slice.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <thread>
 
+#include "absl/memory/memory.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/grpc_authz_end2end_test.cc b/test/cpp/end2end/grpc_authz_end2end_test.cc
index 0d3473c76fa..868ec7bd80a 100644
--- a/test/cpp/end2end/grpc_authz_end2end_test.cc
+++ b/test/cpp/end2end/grpc_authz_end2end_test.cc
@@ -12,11 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -24,6 +20,9 @@
 #include <grpcpp/security/authorization_policy_provider.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/core/lib/security/authorization/audit_logging.h"
 #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h"
diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc
index 34eeb7b5202..f5d4c5da167 100644
--- a/test/cpp/end2end/grpclb_end2end_test.cc
+++ b/test/cpp/end2end/grpclb_end2end_test.cc
@@ -14,6 +14,18 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
 #include <deque>
 #include <memory>
 #include <mutex>
@@ -22,9 +34,6 @@
 #include <string>
 #include <thread>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/cleanup/cleanup.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
@@ -33,17 +42,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/notification.h"
 #include "absl/types/span.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/cpp/end2end/health_service_end2end_test.cc b/test/cpp/end2end/health_service_end2end_test.cc
index 167396cad45..b3ebb18c63b 100644
--- a/test/cpp/end2end/health_service_end2end_test.cc
+++ b/test/cpp/end2end/health_service_end2end_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <memory>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -32,6 +25,12 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <vector>
 
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/health/v1/health.grpc.pb.h"
diff --git a/test/cpp/end2end/hybrid_end2end_test.cc b/test/cpp/end2end/hybrid_end2end_test.cc
index 139dda2eb5d..eb52a780a5a 100644
--- a/test/cpp/end2end/hybrid_end2end_test.cc
+++ b/test/cpp/end2end/hybrid_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <memory>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -32,7 +24,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
diff --git a/test/cpp/end2end/interceptors_util.cc b/test/cpp/end2end/interceptors_util.cc
index f14ef471b6a..37d039a628b 100644
--- a/test/cpp/end2end/interceptors_util.cc
+++ b/test/cpp/end2end/interceptors_util.cc
@@ -20,7 +20,6 @@
 
 #include "absl/log/check.h"
 #include "absl/memory/memory.h"
-
 #include "test/core/test_util/test_config.h"
 
 namespace grpc {
diff --git a/test/cpp/end2end/interceptors_util.h b/test/cpp/end2end/interceptors_util.h
index c16c34cd714..7a890adc944 100644
--- a/test/cpp/end2end/interceptors_util.h
+++ b/test/cpp/end2end/interceptors_util.h
@@ -19,15 +19,13 @@
 #ifndef GRPC_TEST_CPP_END2END_INTERCEPTORS_UTIL_H
 #define GRPC_TEST_CPP_END2END_INTERCEPTORS_UTIL_H
 
-#include <condition_variable>
-
+#include <grpcpp/channel.h>
 #include <gtest/gtest.h>
 
+#include <condition_variable>
+
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpcpp/channel.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/string_ref_helper.h"
diff --git a/test/cpp/end2end/message_allocator_end2end_test.cc b/test/cpp/end2end/message_allocator_end2end_test.cc
index 5546f5685f5..ca9a5d1aab5 100644
--- a/test/cpp/end2end/message_allocator_end2end_test.cc
+++ b/test/cpp/end2end/message_allocator_end2end_test.cc
@@ -16,6 +16,17 @@
 //
 //
 
+#include <google/protobuf/arena.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/support/client_callback.h>
+#include <grpcpp/support/message_allocator.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
@@ -25,21 +36,8 @@
 #include <sstream>
 #include <thread>
 
-#include <google/protobuf/arena.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-
 #include "src/core/lib/iomgr/iomgr.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/mock_test.cc b/test/cpp/end2end/mock_test.cc
index 281267a7f9c..d485c31fda7 100644
--- a/test/cpp/end2end/mock_test.cc
+++ b/test/cpp/end2end/mock_test.cc
@@ -16,15 +16,7 @@
 //
 //
 
-#include <climits>
-#include <iostream>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -35,7 +27,13 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/test/default_reactor_test_peer.h>
 #include <grpcpp/test/mock_stream.h>
+#include <gtest/gtest.h>
 
+#include <climits>
+#include <iostream>
+
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/nonblocking_test.cc b/test/cpp/end2end/nonblocking_test.cc
index 465766afa0a..0d8bcd9ac55 100644
--- a/test/cpp/end2end/nonblocking_test.cc
+++ b/test/cpp/end2end/nonblocking_test.cc
@@ -16,11 +16,6 @@
 //
 //
 
-#include <memory>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -28,6 +23,10 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/end2end/orca_service_end2end_test.cc b/test/cpp/end2end/orca_service_end2end_test.cc
index ce88cb19110..5bc12964b20 100644
--- a/test/cpp/end2end/orca_service_end2end_test.cc
+++ b/test/cpp/end2end/orca_service_end2end_test.cc
@@ -15,12 +15,6 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "absl/types/optional.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -31,7 +25,11 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/types/optional.h"
 #include "src/core/util/time.h"
 #include "src/proto/grpc/testing/xds/v3/orca_service.grpc.pb.h"
 #include "src/proto/grpc/testing/xds/v3/orca_service.pb.h"
diff --git a/test/cpp/end2end/port_sharing_end2end_test.cc b/test/cpp/end2end/port_sharing_end2end_test.cc
index 93461bd9ff4..0527ffc895b 100644
--- a/test/cpp/end2end/port_sharing_end2end_test.cc
+++ b/test/cpp/end2end/port_sharing_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <mutex>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -35,7 +27,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <mutex>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/pollset.h"
diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc
index 478c3c80193..1b4f8d9bd07 100644
--- a/test/cpp/end2end/proto_server_reflection_test.cc
+++ b/test/cpp/end2end/proto_server_reflection_test.cc
@@ -16,12 +16,7 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
 #include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -32,6 +27,10 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <vector>
 
 #include "src/proto/grpc/reflection/v1/reflection.grpc.pb.h"
 #include "src/proto/grpc/reflection/v1/reflection.pb.h"
diff --git a/test/cpp/end2end/raw_end2end_test.cc b/test/cpp/end2end/raw_end2end_test.cc
index 8b28df798f6..c1e2df79e76 100644
--- a/test/cpp/end2end/raw_end2end_test.cc
+++ b/test/cpp/end2end/raw_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <cinttypes>
-#include <memory>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -33,7 +25,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <cinttypes>
+#include <memory>
+#include <thread>
+
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/resource_quota_end2end_stress_test.cc b/test/cpp/end2end/resource_quota_end2end_stress_test.cc
index 64987700a62..37955f80d40 100644
--- a/test/cpp/end2end/resource_quota_end2end_stress_test.cc
+++ b/test/cpp/end2end/resource_quota_end2end_stress_test.cc
@@ -12,24 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/grpc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/server_callback.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/server_callback.h>
-
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
 #include "src/core/lib/experiments/config.h"
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
diff --git a/test/cpp/end2end/rls_end2end_test.cc b/test/cpp/end2end/rls_end2end_test.cc
index 2ed47362d5e..6a6f1f47a1f 100644
--- a/test/cpp/end2end/rls_end2end_test.cc
+++ b/test/cpp/end2end/rls_end2end_test.cc
@@ -21,19 +21,7 @@
 //   fires; request is processed at that point
 // - find some deterministic way to exercise adaptive throttler code
 
-#include <deque>
-#include <map>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_join.h"
-#include "absl/types/optional.h"
-
 #include <grpc/credentials.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
@@ -41,7 +29,17 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/channel_arguments.h>
+#include <gtest/gtest.h>
+
+#include <deque>
+#include <map>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_join.h"
+#include "absl/types/optional.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/cpp/end2end/rls_server.cc b/test/cpp/end2end/rls_server.cc
index f0b520fe9d6..226823d2942 100644
--- a/test/cpp/end2end/rls_server.cc
+++ b/test/cpp/end2end/rls_server.cc
@@ -19,7 +19,6 @@
 #include <gmock/gmock.h>
 
 #include "absl/log/log.h"
-
 #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h"
 #include "src/proto/grpc/lookup/v1/rls.pb.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/rls_server.h b/test/cpp/end2end/rls_server.h
index 149e38c6395..584991da0c4 100644
--- a/test/cpp/end2end/rls_server.h
+++ b/test/cpp/end2end/rls_server.h
@@ -18,7 +18,6 @@
 #define GRPC_TEST_CPP_END2END_RLS_SERVER_H
 
 #include "absl/types/optional.h"
-
 #include "src/core/util/time.h"
 #include "src/proto/grpc/lookup/v1/rls.grpc.pb.h"
 #include "src/proto/grpc/lookup/v1/rls.pb.h"
diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc
index 488e4bbaa58..4dabffdc0b1 100644
--- a/test/cpp/end2end/server_builder_plugin_test.cc
+++ b/test/cpp/end2end/server_builder_plugin_test.cc
@@ -16,12 +16,6 @@
 //
 //
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -34,7 +28,11 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/memory/memory.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/server_crash_test.cc b/test/cpp/end2end/server_crash_test.cc
index bbdea2c1af2..5b784255c5e 100644
--- a/test/cpp/end2end/server_crash_test.cc
+++ b/test/cpp/end2end/server_crash_test.cc
@@ -16,12 +16,6 @@
 //
 //
 
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -30,7 +24,11 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/server_crash_test_client.cc b/test/cpp/end2end/server_crash_test_client.cc
index 01b25967be3..ac1918fa6d7 100644
--- a/test/cpp/end2end/server_crash_test_client.cc
+++ b/test/cpp/end2end/server_crash_test_client.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -24,11 +28,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/end2end/server_early_return_test.cc b/test/cpp/end2end/server_early_return_test.cc
index ddcc713cb86..ac3aff3d404 100644
--- a/test/cpp/end2end/server_early_return_test.cc
+++ b/test/cpp/end2end/server_early_return_test.cc
@@ -16,8 +16,6 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
@@ -29,6 +27,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/server_interceptors_end2end_test.cc b/test/cpp/end2end/server_interceptors_end2end_test.cc
index 5c33115312a..380f7ce3806 100644
--- a/test/cpp/end2end/server_interceptors_end2end_test.cc
+++ b/test/cpp/end2end/server_interceptors_end2end_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <memory>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-#include "absl/memory/memory.h"
-#include "absl/strings/match.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/create_channel.h>
@@ -33,7 +25,13 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/server_interceptor.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+#include <vector>
+
+#include "absl/memory/memory.h"
+#include "absl/strings/match.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/server_load_reporting_end2end_test.cc b/test/cpp/end2end/server_load_reporting_end2end_test.cc
index 5365264c5bd..076ca75c7dd 100644
--- a/test/cpp/end2end/server_load_reporting_end2end_test.cc
+++ b/test/cpp/end2end/server_load_reporting_end2end_test.cc
@@ -16,20 +16,18 @@
 //
 //
 
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc++/grpc++.h>
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpcpp/ext/server_load_reporting.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/end2end/service_config_end2end_test.cc b/test/cpp/end2end/service_config_end2end_test.cc
index 6ff1835aa2f..381440cc61e 100644
--- a/test/cpp/end2end/service_config_end2end_test.cc
+++ b/test/cpp/end2end/service_config_end2end_test.cc
@@ -16,22 +16,7 @@
 //
 //
 
-#include <algorithm>
-#include <memory>
-#include <mutex>
-#include <random>
-#include <set>
-#include <string>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/atm.h>
@@ -44,7 +29,20 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/validate_service_config.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <memory>
+#include <mutex>
+#include <random>
+#include <set>
+#include <string>
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/client_channel/global_subchannel_pool.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc
index dcfb52099b6..13dd5b0fa13 100644
--- a/test/cpp/end2end/shutdown_test.cc
+++ b/test/cpp/end2end/shutdown_test.cc
@@ -16,13 +16,6 @@
 //
 //
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/sync.h>
 #include <grpcpp/channel.h>
@@ -31,7 +24,12 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <thread>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/ssl_credentials_test.cc b/test/cpp/end2end/ssl_credentials_test.cc
index b111e5bfbc2..64ec168f016 100644
--- a/test/cpp/end2end/ssl_credentials_test.cc
+++ b/test/cpp/end2end/ssl_credentials_test.cc
@@ -15,14 +15,7 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
@@ -30,7 +23,12 @@
 #include <grpcpp/create_channel.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
+#include "absl/log/log.h"
+#include "absl/synchronization/notification.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/cpp/end2end/streaming_throughput_test.cc b/test/cpp/end2end/streaming_throughput_test.cc
index 8fb9f975349..a52fce46a3d 100644
--- a/test/cpp/end2end/streaming_throughput_test.cc
+++ b/test/cpp/end2end/streaming_throughput_test.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <time.h>
-
-#include <mutex>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/time.h>
@@ -36,7 +27,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+#include <time.h>
 
+#include <mutex>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/test_health_check_service_impl.h b/test/cpp/end2end/test_health_check_service_impl.h
index 55d53082480..f699a78451d 100644
--- a/test/cpp/end2end/test_health_check_service_impl.h
+++ b/test/cpp/end2end/test_health_check_service_impl.h
@@ -18,12 +18,12 @@
 #ifndef GRPC_TEST_CPP_END2END_TEST_HEALTH_CHECK_SERVICE_IMPL_H
 #define GRPC_TEST_CPP_END2END_TEST_HEALTH_CHECK_SERVICE_IMPL_H
 
-#include <map>
-#include <mutex>
-
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/status.h>
 
+#include <map>
+#include <mutex>
+
 #include "src/proto/grpc/health/v1/health.grpc.pb.h"
 
 namespace grpc {
diff --git a/test/cpp/end2end/test_service_impl.cc b/test/cpp/end2end/test_service_impl.cc
index 26810842ac3..b2b347f7aab 100644
--- a/test/cpp/end2end/test_service_impl.cc
+++ b/test/cpp/end2end/test_service_impl.cc
@@ -18,18 +18,16 @@
 
 #include "test/cpp/end2end/test_service_impl.h"
 
+#include <grpcpp/alarm.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
 #include <string>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/alarm.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/notification.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/test_service_impl.h b/test/cpp/end2end/test_service_impl.h
index c1860573d9e..0ffa3bceac0 100644
--- a/test/cpp/end2end/test_service_impl.h
+++ b/test/cpp/end2end/test_service_impl.h
@@ -19,22 +19,20 @@
 #ifndef GRPC_TEST_CPP_END2END_TEST_SERVICE_IMPL_H
 #define GRPC_TEST_CPP_END2END_TEST_SERVICE_IMPL_H
 
+#include <grpc/grpc.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc
index b8171015e6c..b471759ce72 100644
--- a/test/cpp/end2end/thread_stress_test.cc
+++ b/test/cpp/end2end/thread_stress_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <cinttypes>
-#include <mutex>
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -34,7 +26,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
+#include <cinttypes>
+#include <mutex>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/time_change_test.cc b/test/cpp/end2end/time_change_test.cc
index dd8a9a94441..6c64048903e 100644
--- a/test/cpp/end2end/time_change_test.cc
+++ b/test/cpp/end2end/time_change_test.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <sys/time.h>
-
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/channel.h>
@@ -33,7 +24,13 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+#include <sys/time.h>
 
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/memory/memory.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/tls_credentials_test.cc b/test/cpp/end2end/tls_credentials_test.cc
index 9e9c69b257c..381faad2314 100644
--- a/test/cpp/end2end/tls_credentials_test.cc
+++ b/test/cpp/end2end/tls_credentials_test.cc
@@ -15,14 +15,7 @@
 // limitations under the License.
 //
 //
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/synchronization/notification.h"
-
 #include <grpc/grpc_security.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -31,7 +24,12 @@
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
+#include "absl/log/log.h"
+#include "absl/synchronization/notification.h"
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/cpp/end2end/tls_key_export_test.cc b/test/cpp/end2end/tls_key_export_test.cc
index ad08372f20f..e3db9de2f53 100644
--- a/test/cpp/end2end/tls_key_export_test.cc
+++ b/test/cpp/end2end/tls_key_export_test.cc
@@ -12,6 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc++/grpc++.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/security/tls_credentials_options.h>
+#include <grpcpp/support/channel_arguments.h>
+
 #include <memory>
 #include <string>
 #include <thread>  // NOLINT
@@ -23,14 +30,6 @@
 #include "absl/strings/string_view.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc++/grpc++.h>
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/security/tls_credentials_options.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/util/tmpfile.h"
 #include "src/cpp/client/secure_credentials.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
index c10f22d4851..282d8fa3d35 100644
--- a/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_cluster_end2end_test.cc
@@ -13,17 +13,16 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <numeric>
 #include <string>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
index b80b344da03..c03bd0580b1 100644
--- a/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_cluster_type_end2end_test.cc
@@ -13,18 +13,16 @@
 // limitations under the License.
 //
 
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
 #include <gtest/gtest.h>
 
+#include <vector>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_core_end2end_test.cc b/test/cpp/end2end/xds/xds_core_end2end_test.cc
index e8d0ed404eb..194ed6d15b0 100644
--- a/test/cpp/end2end/xds/xds_core_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_core_end2end_test.cc
@@ -13,18 +13,17 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <type_traits>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/listener.pb.h"
diff --git a/test/cpp/end2end/xds/xds_credentials_end2end_test.cc b/test/cpp/end2end/xds/xds_credentials_end2end_test.cc
index 10e4f5cf80c..6eea137a8ea 100644
--- a/test/cpp/end2end/xds/xds_credentials_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_credentials_end2end_test.cc
@@ -17,10 +17,9 @@
 //
 
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/end2end/xds/xds_csds_end2end_test.cc b/test/cpp/end2end/xds/xds_csds_end2end_test.cc
index cf498e060f8..3b697adaf80 100644
--- a/test/cpp/end2end/xds/xds_csds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_csds_end2end_test.cc
@@ -13,21 +13,19 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/strip.h"
-
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc
index cf003274740..428a88c5edc 100644
--- a/test/cpp/end2end/xds/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test.cc
@@ -18,6 +18,21 @@
 // - mTLS functionality on both client and server
 // - RBAC
 
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/audit_logging.h>
+#include <grpcpp/security/tls_certificate_provider.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/xds_server_builder.h>
+#include <gtest/gtest.h>
+
 #include <deque>
 #include <memory>
 #include <mutex>
@@ -28,9 +43,6 @@
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/functional/bind_front.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
@@ -42,20 +54,6 @@
 #include "absl/strings/str_replace.h"
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/audit_logging.h>
-#include <grpcpp/security/tls_certificate_provider.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/ext/filters/http/client/http_client_filter.h"
 #include "src/core/lib/address_utils/parse_address.h"
diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.cc b/test/cpp/end2end/xds/xds_end2end_test_lib.cc
index 1ba85995c09..7ddf6c7b607 100644
--- a/test/cpp/end2end/xds/xds_end2end_test_lib.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test_lib.cc
@@ -15,6 +15,10 @@
 
 #include "test/cpp/end2end/xds/xds_end2end_test_lib.h"
 
+#include <gmock/gmock.h>
+#include <grpcpp/security/tls_certificate_provider.h>
+#include <gtest/gtest.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -23,9 +27,6 @@
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
@@ -34,9 +35,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpcpp/security/tls_certificate_provider.h>
-
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/server/server.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/xds/xds_end2end_test_lib.h b/test/cpp/end2end/xds/xds_end2end_test_lib.h
index 02e3fcbe50d..82164785750 100644
--- a/test/cpp/end2end/xds/xds_end2end_test_lib.h
+++ b/test/cpp/end2end/xds/xds_end2end_test_lib.h
@@ -16,30 +16,28 @@
 #ifndef GRPC_TEST_CPP_END2END_XDS_XDS_END2END_TEST_LIB_H
 #define GRPC_TEST_CPP_END2END_XDS_XDS_END2END_TEST_LIB_H
 
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/grpc_security.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/server_metric_recorder.h>
+#include <grpcpp/xds_server_builder.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <set>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_security.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/ext/call_metric_recorder.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/lib/security/credentials/fake/fake_credentials.h"
 #include "src/core/lib/security/security_connector/ssl_utils.h"
 #include "src/cpp/server/secure_server_credentials.h"
diff --git a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc
index 49e22de0e0b..a1b5c163cc1 100644
--- a/test/cpp/end2end/xds/xds_fallback_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_fallback_end2end_test.cc
@@ -12,22 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+#include <gmock/gmock.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <string_view>
 #include <type_traits>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/cleanup/cleanup.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/strip.h"
-
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
diff --git a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc
index 3c560fc5c5e..40b8ac3c24e 100644
--- a/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_fault_injection_end2end_test.cc
@@ -13,12 +13,12 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
index 775eb60e6fc..19a0bae4a9d 100644
--- a/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_gcp_authn_end2end_test.cc
@@ -14,14 +14,13 @@
 // limitations under the License.
 //
 
+#include <grpc/support/string_util.h>
+
 #include <string>
 #include <vector>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/support/string_util.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/http_client/httpcli.h"
diff --git a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
index 17df1d08cac..1c99747b18d 100644
--- a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/check.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
index 69eb72cbddd..c166b5225a5 100644
--- a/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_override_host_end2end_test.cc
@@ -12,17 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/time.h"
 #include "src/proto/grpc/testing/xds/v3/stateful_session.pb.h"
diff --git a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
index f0d6796691d..9feba2fd859 100644
--- a/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_pick_first_end2end_test.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 //
 
+#include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
 #include <unistd.h>
 
 #include <cstddef>
@@ -21,14 +25,7 @@
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/strings/str_cat.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
index 86aba3e8121..8fee5c9c99d 100644
--- a/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_ring_hash_end2end_test.cc
@@ -13,19 +13,17 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/config/config_vars.h"
diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc
index 2297d159ca9..2f3c9d0f79c 100644
--- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc
@@ -13,14 +13,13 @@
 // limitations under the License.
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <memory>
+
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/xds/xds_routing_end2end_test.cc b/test/cpp/end2end/xds/xds_routing_end2end_test.cc
index 7b7a2be9a52..022b92660ed 100644
--- a/test/cpp/end2end/xds/xds_routing_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_routing_end2end_test.cc
@@ -12,16 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <chrono>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/fault.grpc.pb.h"
diff --git a/test/cpp/end2end/xds/xds_server.cc b/test/cpp/end2end/xds/xds_server.cc
index bbae462c994..4b7450eb171 100644
--- a/test/cpp/end2end/xds/xds_server.cc
+++ b/test/cpp/end2end/xds/xds_server.cc
@@ -25,7 +25,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h
index 2b6c508faf7..5ba992abc59 100644
--- a/test/cpp/end2end/xds/xds_server.h
+++ b/test/cpp/end2end/xds/xds_server.h
@@ -17,6 +17,8 @@
 #ifndef GRPC_TEST_CPP_END2END_XDS_XDS_SERVER_H
 #define GRPC_TEST_CPP_END2END_XDS_XDS_SERVER_H
 
+#include <grpcpp/support/status.h>
+
 #include <deque>
 #include <set>
 #include <string>
@@ -26,9 +28,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/types/optional.h"
-
-#include <grpcpp/support/status.h>
-
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/end2end/xds/xds_utils.cc b/test/cpp/end2end/xds/xds_utils.cc
index c52e819172e..28314835ffa 100644
--- a/test/cpp/end2end/xds/xds_utils.cc
+++ b/test/cpp/end2end/xds/xds_utils.cc
@@ -15,6 +15,8 @@
 
 #include "test/cpp/end2end/xds/xds_utils.h"
 
+#include <grpcpp/security/tls_certificate_provider.h>
+
 #include <functional>
 #include <map>
 #include <memory>
@@ -30,9 +32,6 @@
 #include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-
-#include <grpcpp/security/tls_certificate_provider.h>
-
 #include "src/core/ext/filters/http/server/http_server_filter.h"
 #include "src/core/server/server.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/end2end/xds/xds_utils.h b/test/cpp/end2end/xds/xds_utils.h
index 039dd19c53e..7d9a95ffe49 100644
--- a/test/cpp/end2end/xds/xds_utils.h
+++ b/test/cpp/end2end/xds/xds_utils.h
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include "absl/strings/string_view.h"
-
 #include "src/proto/grpc/testing/xds/v3/cluster.pb.h"
 #include "src/proto/grpc/testing/xds/v3/endpoint.pb.h"
 #include "src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h"
diff --git a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc
index da8cea70f54..bdd42fcedd4 100644
--- a/test/cpp/end2end/xds/xds_wrr_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_wrr_end2end_test.cc
@@ -13,19 +13,17 @@
 // limitations under the License.
 //
 
-#include <string>
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/event_engine/endpoint_config.h>
+#include <grpcpp/ext/server_metric_recorder.h>
 #include <gtest/gtest.h>
 
+#include <string>
+#include <vector>
+
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/endpoint_config.h>
-#include <grpcpp/ext/server_metric_recorder.h>
-
 #include "src/core/client_channel/backup_poller.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/proto/grpc/testing/xds/v3/client_side_weighted_round_robin.grpc.pb.h"
diff --git a/test/cpp/ext/chaotic_good_test.cc b/test/cpp/ext/chaotic_good_test.cc
index d77a3b98d55..c7d7927354d 100644
--- a/test/cpp/ext/chaotic_good_test.cc
+++ b/test/cpp/ext/chaotic_good_test.cc
@@ -14,10 +14,9 @@
 
 #include "src/cpp/ext/chaotic_good.h"
 
-#include "gtest/gtest.h"
-
 #include <grpcpp/create_channel.h>
 
+#include "gtest/gtest.h"
 #include "test/core/test_util/test_config.h"
 
 namespace grpc {
diff --git a/test/cpp/ext/csm/csm_observability_test.cc b/test/cpp/ext/csm/csm_observability_test.cc
index 380c8940b7a..c36b37efee1 100644
--- a/test/cpp/ext/csm/csm_observability_test.cc
+++ b/test/cpp/ext/csm/csm_observability_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/cpp/ext/csm/csm_observability.h"
 
-#include "google/cloud/opentelemetry/resource_detector.h"
-#include "gtest/gtest.h"
-#include "opentelemetry/sdk/metrics/meter_provider.h"
-
 #include <grpcpp/ext/csm_observability.h>
 #include <grpcpp/ext/otel_plugin.h>
 
+#include "google/cloud/opentelemetry/resource_detector.h"
+#include "gtest/gtest.h"
+#include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "src/core/xds/grpc/xds_enabled_server.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/ext/csm/mesh_id_test.cc b/test/cpp/ext/csm/mesh_id_test.cc
index e1a7f86fc80..c18526dbf84 100644
--- a/test/cpp/ext/csm/mesh_id_test.cc
+++ b/test/cpp/ext/csm/mesh_id_test.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include "gtest/gtest.h"
-
 #include <grpcpp/grpcpp.h>
 
+#include "gtest/gtest.h"
 #include "src/core/util/env.h"
 #include "src/core/util/tmpfile.h"
 #include "src/cpp/ext/csm/metadata_exchange.h"
diff --git a/test/cpp/ext/csm/metadata_exchange_test.cc b/test/cpp/ext/csm/metadata_exchange_test.cc
index 1b85eaf185a..08fb8bd9823 100644
--- a/test/cpp/ext/csm/metadata_exchange_test.cc
+++ b/test/cpp/ext/csm/metadata_exchange_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/csm/metadata_exchange.h"
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include "absl/functional/any_invocable.h"
 #include "gmock/gmock.h"
 #include "google/cloud/opentelemetry/resource_detector.h"
@@ -25,10 +28,6 @@
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/core/util/env.h"
diff --git a/test/cpp/ext/filters/census/constant_labels_test.cc b/test/cpp/ext/filters/census/constant_labels_test.cc
index 0f7c6128814..0688e5c07b6 100644
--- a/test/cpp/ext/filters/census/constant_labels_test.cc
+++ b/test/cpp/ext/filters/census/constant_labels_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -26,10 +29,6 @@
 #include "opencensus/stats/stats.h"
 #include "opencensus/stats/testing/test_utils.h"
 #include "opencensus/tags/tag_map.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/cpp/ext/filters/census/context.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/ext/filters/census/library.h b/test/cpp/ext/filters/census/library.h
index 243dd968f64..c1fa9f58f71 100644
--- a/test/cpp/ext/filters/census/library.h
+++ b/test/cpp/ext/filters/census/library.h
@@ -19,6 +19,9 @@
 #ifndef GRPC_TEST_CPP_EXT_FILTERS_CENSUS_LIBRARY_H
 #define GRPC_TEST_CPP_EXT_FILTERS_CENSUS_LIBRARY_H
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -27,10 +30,6 @@
 #include "gtest/gtest.h"
 #include "opencensus/stats/stats.h"
 #include "opencensus/trace/exporter/span_exporter.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/cpp/client/client_stats_interceptor.h"
 #include "src/cpp/ext/filters/census/client_filter.h"
diff --git a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
index d569b1a41c9..3bad979cd29 100644
--- a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
+++ b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -29,10 +32,6 @@
 #include "opencensus/stats/testing/test_utils.h"
 #include "opencensus/tags/tag_map.h"
 #include "opencensus/tags/with_tag_map.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/experiments/experiments.h"
 #include "src/cpp/ext/filters/census/context.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
diff --git a/test/cpp/ext/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h
index f1ca3fc9576..bffa8a18fe7 100644
--- a/test/cpp/ext/filters/logging/library.h
+++ b/test/cpp/ext/filters/logging/library.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_TEST_CPP_EXT_FILTERS_LOGGING_LIBRARY_H
 #define GRPC_TEST_CPP_EXT_FILTERS_LOGGING_LIBRARY_H
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/support/status.h>
+
 #include <chrono>
 #include <thread>  // NOLINT
 
@@ -29,11 +33,6 @@
 #include "gmock/gmock.h"
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/util/sync.h"
 #include "src/cpp/ext/gcp/observability_logging_sink.h"
diff --git a/test/cpp/ext/filters/logging/logging_census_integration_test.cc b/test/cpp/ext/filters/logging/logging_census_integration_test.cc
index 622c93ffbb4..e6142d4f8fa 100644
--- a/test/cpp/ext/filters/logging/logging_census_integration_test.cc
+++ b/test/cpp/ext/filters/logging/logging_census_integration_test.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/opencensus.h>
+#include <grpcpp/support/status.h>
+
 #include <chrono>
 #include <thread>  // NOLINT
 
@@ -25,11 +29,6 @@
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
 #include "opencensus/stats/testing/test_utils.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/opencensus.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/ext/filters/logging/logging_test.cc b/test/cpp/ext/filters/logging/logging_test.cc
index 6441e1cefcf..e94c5c5889e 100644
--- a/test/cpp/ext/filters/logging/logging_test.cc
+++ b/test/cpp/ext/filters/logging/logging_test.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc++/grpc++.h>
+#include <grpcpp/support/status.h>
+
 #include <chrono>
 #include <thread>  // NOLINT
 
@@ -24,10 +27,6 @@
 #include "gmock/gmock.h"
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-
-#include <grpc++/grpc++.h>
-#include <grpcpp/support/status.h>
-
 #include "src/core/ext/filters/logging/logging_filter.h"
 #include "src/core/util/dump_args.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/ext/gcp/environment_autodetect_test.cc b/test/cpp/ext/gcp/environment_autodetect_test.cc
index d466a48ba93..fa707266829 100644
--- a/test/cpp/ext/gcp/environment_autodetect_test.cc
+++ b/test/cpp/ext/gcp/environment_autodetect_test.cc
@@ -18,6 +18,8 @@
 
 #include "src/cpp/ext/gcp/environment_autodetect.h"
 
+#include <grpc/grpc.h>
+
 #include <string>
 #include <thread>  // NOLINT
 #include <vector>
@@ -26,9 +28,6 @@
 #include "absl/synchronization/notification.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-
-#include <grpc/grpc.h>
-
 #include "src/core/util/env.h"
 #include "src/core/util/notification.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/ext/gcp/observability_config_test.cc b/test/cpp/ext/gcp/observability_config_test.cc
index 391832b13d5..31ba998455f 100644
--- a/test/cpp/ext/gcp/observability_config_test.cc
+++ b/test/cpp/ext/gcp/observability_config_test.cc
@@ -16,11 +16,10 @@
 
 #include "src/cpp/ext/gcp/observability_config.h"
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc/support/alloc.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/env.h"
 #include "src/core/util/json/json_reader.h"
diff --git a/test/cpp/ext/gcp/observability_logging_sink_test.cc b/test/cpp/ext/gcp/observability_logging_sink_test.cc
index 2349fe6b60c..f425fb7ac64 100644
--- a/test/cpp/ext/gcp/observability_logging_sink_test.cc
+++ b/test/cpp/ext/gcp/observability_logging_sink_test.cc
@@ -21,7 +21,6 @@
 #include "gmock/gmock.h"
 #include "google/protobuf/text_format.h"
 #include "gtest/gtest.h"
-
 #include "src/core/util/json/json_reader.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/ext/gcp/observability_test.cc b/test/cpp/ext/gcp/observability_test.cc
index 93779f9da40..ca26f6a9e93 100644
--- a/test/cpp/ext/gcp/observability_test.cc
+++ b/test/cpp/ext/gcp/observability_test.cc
@@ -14,12 +14,11 @@
 // limitations under the License.
 //
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
 #include <grpc++/grpc++.h>
 #include <grpcpp/ext/gcp_observability.h>
 
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc
index d5f95377d00..4c96d0eef26 100644
--- a/test/cpp/ext/otel/otel_plugin_test.cc
+++ b/test/cpp/ext/otel/otel_plugin_test.cc
@@ -18,6 +18,9 @@
 
 #include "src/cpp/ext/otel/otel_plugin.h"
 
+#include <grpcpp/ext/otel_plugin.h>
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <chrono>
 #include <ratio>
@@ -34,10 +37,6 @@
 #include "opentelemetry/sdk/metrics/data/point_data.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpcpp/ext/otel_plugin.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc
index 131aeef222f..15bc96c63c1 100644
--- a/test/cpp/ext/otel/otel_test_library.cc
+++ b/test/cpp/ext/otel/otel_test_library.cc
@@ -18,6 +18,8 @@
 
 #include "test/cpp/ext/otel/otel_test_library.h"
 
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <memory>
 
@@ -28,9 +30,6 @@
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/telemetry/call_tracer.h"
diff --git a/test/cpp/ext/otel/otel_test_library.h b/test/cpp/ext/otel/otel_test_library.h
index 38859f68710..78195fe3541 100644
--- a/test/cpp/ext/otel/otel_test_library.h
+++ b/test/cpp/ext/otel/otel_test_library.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H
 #define GRPC_TEST_CPP_EXT_OTEL_OTEL_TEST_LIBRARY_H
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/generic/generic_stub.h>
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <thread>
 
@@ -28,11 +32,6 @@
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/metric_reader.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/generic/generic_stub.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/telemetry/call_tracer.h"
 #include "src/cpp/ext/otel/otel_plugin.h"
diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc
index 31298a2c9c2..b7ee1423d77 100644
--- a/test/cpp/grpclb/grpclb_api_test.cc
+++ b/test/cpp/grpclb/grpclb_api_test.cc
@@ -16,20 +16,18 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/support/config.h>
 #include <gtest/gtest.h>
 
 #include "absl/log/check.h"
 #include "google/protobuf/duration.upb.h"
-#include "upb/mem/arena.hpp"
-
-#include <grpc/grpc.h>
-#include <grpcpp/support/config.h>
-
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/load_balancing/grpclb/load_balancer_api.h"
 #include "src/proto/grpc/lb/v1/load_balancer.pb.h"  // C++ version
 #include "test/core/test_util/test_config.h"
+#include "upb/mem/arena.hpp"
 
 namespace grpc {
 namespace {
diff --git a/test/cpp/interop/backend_metrics_lb_policy.cc b/test/cpp/interop/backend_metrics_lb_policy.cc
index 55487bc221b..58be2709fe0 100644
--- a/test/cpp/interop/backend_metrics_lb_policy.cc
+++ b/test/cpp/interop/backend_metrics_lb_policy.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/interop/backend_metrics_lb_policy.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/oob_backend_metric.h"
diff --git a/test/cpp/interop/backend_metrics_lb_policy_test.cc b/test/cpp/interop/backend_metrics_lb_policy_test.cc
index 0a5fb277bab..1d2dc8372d2 100644
--- a/test/cpp/interop/backend_metrics_lb_policy_test.cc
+++ b/test/cpp/interop/backend_metrics_lb_policy_test.cc
@@ -18,17 +18,16 @@
 
 #include "test/cpp/interop/backend_metrics_lb_policy.h"
 
-#include <memory>
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/ext/call_metric_recorder.h>
 #include <grpcpp/ext/orca_service.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
+#include <memory>
+#include <thread>
 
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc
index fe211e71ddb..4802be5786e 100644
--- a/test/cpp/interop/client.cc
+++ b/test/cpp/interop/client.cc
@@ -16,18 +16,17 @@
 //
 //
 
-#include <memory>
-#include <unordered_map>
-
-#include "absl/flags/flag.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+#include <unordered_map>
+
+#include "absl/flags/flag.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc
index 8963aecc4ff..b5c78dd303a 100644
--- a/test/cpp/interop/client_helper.cc
+++ b/test/cpp/interop/client_helper.cc
@@ -18,6 +18,13 @@
 
 #include "test/cpp/interop/client_helper.h"
 
+#include <grpc/credentials.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/security/credentials.h>
+
 #include <fstream>
 #include <memory>
 #include <sstream>
@@ -28,14 +35,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
-
-#include <grpc/credentials.h>
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/security/credentials.h>
-
 #include "test/core/security/oauth2_utils.h"
 #include "test/cpp/util/create_test_channel.h"
 #include "test/cpp/util/test_credentials_provider.h"
diff --git a/test/cpp/interop/client_helper.h b/test/cpp/interop/client_helper.h
index 35bd62f5a58..1c1ed0d4223 100644
--- a/test/cpp/interop/client_helper.h
+++ b/test/cpp/interop/client_helper.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H
 #define GRPC_TEST_CPP_INTEROP_CLIENT_HELPER_H
 
-#include <functional>
-#include <memory>
-#include <unordered_map>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <functional>
+#include <memory>
+#include <unordered_map>
+
 #include "src/core/lib/surface/call_test_only.h"
 #include "src/core/lib/transport/transport.h"
 
diff --git a/test/cpp/interop/grpclb_fallback_test.cc b/test/cpp/interop/grpclb_fallback_test.cc
index 7d3c637fee2..2a8a02c6fc3 100644
--- a/test/cpp/interop/grpclb_fallback_test.cc
+++ b/test/cpp/interop/grpclb_fallback_test.cc
@@ -18,6 +18,12 @@
 
 #include <arpa/inet.h>
 #include <fcntl.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/channel_arguments.h>
 #include <inttypes.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
@@ -35,14 +41,6 @@
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/time.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/interop/http2_client.cc b/test/cpp/interop/http2_client.cc
index d19b0b6616a..76e7794b427 100644
--- a/test/cpp/interop/http2_client.cc
+++ b/test/cpp/interop/http2_client.cc
@@ -18,17 +18,16 @@
 
 #include "test/cpp/interop/http2_client.h"
 
+#include <grpc/support/alloc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+
 #include <thread>
 
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/alloc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "src/core/util/useful.h"
diff --git a/test/cpp/interop/http2_client.h b/test/cpp/interop/http2_client.h
index 4eeaaf4125b..d6aeaa2a35a 100644
--- a/test/cpp/interop/http2_client.h
+++ b/test/cpp/interop/http2_client.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CPP_INTEROP_HTTP2_CLIENT_H
 #define GRPC_TEST_CPP_INTEROP_HTTP2_CLIENT_H
 
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 
+#include <memory>
+
 #include "src/proto/grpc/testing/messages.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
 
diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc
index 1190ecd7476..d259cdcfd26 100644
--- a/test/cpp/interop/interop_client.cc
+++ b/test/cpp/interop/interop_client.cc
@@ -18,6 +18,14 @@
 
 #include "test/cpp/interop/interop_client.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/security/credentials.h>
+
 #include <cinttypes>
 #include <fstream>
 #include <memory>
@@ -32,15 +40,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/types/optional.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/security/credentials.h>
-
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h
index cfebf466678..2cf3fa81b10 100644
--- a/test/cpp/interop/interop_client.h
+++ b/test/cpp/interop/interop_client.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CPP_INTEROP_INTEROP_CLIENT_H
 #define GRPC_TEST_CPP_INTEROP_INTEROP_CLIENT_H
 
-#include <cstdint>
-#include <memory>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 
+#include <cstdint>
+#include <memory>
+
 #include "src/proto/grpc/testing/messages.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
 #include "test/cpp/interop/backend_metrics_lb_policy.h"
diff --git a/test/cpp/interop/interop_server.cc b/test/cpp/interop/interop_server.cc
index 25f5f633bfc..f22d4bf035c 100644
--- a/test/cpp/interop/interop_server.cc
+++ b/test/cpp/interop/interop_server.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <fstream>
-#include <memory>
-#include <sstream>
-#include <thread>
-
-#include "absl/flags/flag.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/ext/call_metric_recorder.h>
@@ -35,6 +26,14 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <fstream>
+#include <memory>
+#include <sstream>
+#include <thread>
+
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/interop/interop_test.cc b/test/cpp/interop/interop_test.cc
index 1134971371d..74c30d778fd 100644
--- a/test/cpp/interop/interop_test.cc
+++ b/test/cpp/interop/interop_test.cc
@@ -17,6 +17,7 @@
 //
 
 #include <assert.h>
+#include <grpc/support/alloc.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,9 +32,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/socket_utils_posix.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc
index bb24edcae46..f661911f3e3 100644
--- a/test/cpp/interop/istio_echo_server.cc
+++ b/test/cpp/interop/istio_echo_server.cc
@@ -14,6 +14,15 @@
 // limitations under the License.
 //
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+#include <grpcpp/support/string_ref.h>
+#include <grpcpp/xds_server_builder.h>
+
 #include <algorithm>
 #include <atomic>
 #include <chrono>
@@ -34,16 +43,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
-
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/support/string_ref.h>
-#include <grpcpp/xds_server_builder.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/env.h"
 #include "src/core/util/gethostname.h"
diff --git a/test/cpp/interop/istio_echo_server_lib.cc b/test/cpp/interop/istio_echo_server_lib.cc
index f0ddd49c80a..8d8949a820b 100644
--- a/test/cpp/interop/istio_echo_server_lib.cc
+++ b/test/cpp/interop/istio_echo_server_lib.cc
@@ -16,6 +16,9 @@
 
 #include "test/cpp/interop/istio_echo_server_lib.h"
 
+#include <grpcpp/client_context.h>
+#include <grpcpp/grpcpp.h>
+
 #include <thread>
 
 #include "absl/log/log.h"
@@ -23,10 +26,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "absl/synchronization/blocking_counter.h"
-
-#include <grpcpp/client_context.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/istio_echo.pb.h"
 
diff --git a/test/cpp/interop/istio_echo_server_test.cc b/test/cpp/interop/istio_echo_server_test.cc
index faa9a47ac57..927103e405e 100644
--- a/test/cpp/interop/istio_echo_server_test.cc
+++ b/test/cpp/interop/istio_echo_server_test.cc
@@ -14,19 +14,17 @@
 // limitations under the License.
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/host_port.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc
index 9eb4f488b14..06352eaed6b 100644
--- a/test/cpp/interop/metrics_client.cc
+++ b/test/cpp/interop/metrics_client.cc
@@ -16,13 +16,12 @@
 // is % allowed in string
 //
 
+#include <grpcpp/grpcpp.h>
+
 #include <memory>
 #include <string>
 
 #include "absl/flags/flag.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
diff --git a/test/cpp/interop/observability_client.cc b/test/cpp/interop/observability_client.cc
index c264aa504ec..8e2132dcd98 100644
--- a/test/cpp/interop/observability_client.cc
+++ b/test/cpp/interop/observability_client.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/ext/otel_plugin.h>
+
 #include <memory>
 #include <unordered_map>
 
@@ -24,14 +31,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/ext/gcp_observability.h>
-#include <grpcpp/ext/otel_plugin.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/interop/observability_interop_server_bootstrap.cc b/test/cpp/interop/observability_interop_server_bootstrap.cc
index f14755b5cd9..097ff933d03 100644
--- a/test/cpp/interop/observability_interop_server_bootstrap.cc
+++ b/test/cpp/interop/observability_interop_server_bootstrap.cc
@@ -16,13 +16,11 @@
 //
 //
 
+#include <grpcpp/ext/gcp_observability.h>
 #include <signal.h>
 
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/ext/gcp_observability.h>
-
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/interop/server_helper.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/interop/pre_stop_hook_server.cc b/test/cpp/interop/pre_stop_hook_server.cc
index a00ab791a9d..ea8b7d8b807 100644
--- a/test/cpp/interop/pre_stop_hook_server.cc
+++ b/test/cpp/interop/pre_stop_hook_server.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/interop/pre_stop_hook_server.h"
 
+#include <grpcpp/grpcpp.h>
+
 #include <thread>
 
 #include "absl/strings/str_format.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/sync.h"
 #include "src/proto/grpc/testing/messages.pb.h"
 
diff --git a/test/cpp/interop/pre_stop_hook_server_test.cc b/test/cpp/interop/pre_stop_hook_server_test.cc
index 32aa91b1bc2..0097a9e3fbc 100644
--- a/test/cpp/interop/pre_stop_hook_server_test.cc
+++ b/test/cpp/interop/pre_stop_hook_server_test.cc
@@ -16,17 +16,15 @@
 
 #include "test/cpp/interop/pre_stop_hook_server.h"
 
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/grpcpp.h>
 #include <grpcpp/support/status.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/strings/str_format.h"
 #include "src/core/util/sync.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/interop/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc
index 1c2e4837ec0..bb46bfedd10 100644
--- a/test/cpp/interop/reconnect_interop_client.cc
+++ b/test/cpp/interop/reconnect_interop_client.cc
@@ -16,18 +16,17 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/support/channel_arguments.h>
+
 #include <memory>
 #include <sstream>
 
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/support/channel_arguments.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc
index a5ac668bb29..a118802661c 100644
--- a/test/cpp/interop/reconnect_interop_server.cc
+++ b/test/cpp/interop/reconnect_interop_server.cc
@@ -18,6 +18,10 @@
 
 // Test description at doc/connection-backoff-interop-test-description.md
 
+#include <grpc/grpc.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
 #include <signal.h>
 
 #include <condition_variable>
@@ -28,12 +32,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/interop/rpc_behavior_lb_policy.cc b/test/cpp/interop/rpc_behavior_lb_policy.cc
index 8d8826a03d1..4b8cfc10956 100644
--- a/test/cpp/interop/rpc_behavior_lb_policy.cc
+++ b/test/cpp/interop/rpc_behavior_lb_policy.cc
@@ -18,11 +18,10 @@
 
 #include "test/cpp/interop/rpc_behavior_lb_policy.h"
 
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/support/port_platform.h>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/util/json/json_args.h"
diff --git a/test/cpp/interop/server_helper.cc b/test/cpp/interop/server_helper.cc
index 8dfc5576d7a..e79912f3bde 100644
--- a/test/cpp/interop/server_helper.cc
+++ b/test/cpp/interop/server_helper.cc
@@ -18,13 +18,12 @@
 
 #include "test/cpp/interop/server_helper.h"
 
+#include <grpcpp/security/server_credentials.h>
+
 #include <memory>
 
 #include "absl/flags/declare.h"
 #include "absl/flags/flag.h"
-
-#include <grpcpp/security/server_credentials.h>
-
 #include "src/core/lib/surface/call_test_only.h"
 #include "src/core/lib/transport/transport.h"
 #include "test/cpp/util/test_credentials_provider.h"
diff --git a/test/cpp/interop/server_helper.h b/test/cpp/interop/server_helper.h
index 9acb77f624e..bdec6cf4b1e 100644
--- a/test/cpp/interop/server_helper.h
+++ b/test/cpp/interop/server_helper.h
@@ -19,9 +19,6 @@
 #ifndef GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H
 #define GRPC_TEST_CPP_INTEROP_SERVER_HELPER_H
 
-#include <condition_variable>
-#include <memory>
-
 #include <grpc/compression.h>
 #include <grpc/support/atm.h>
 #include <grpcpp/security/server_credentials.h>
@@ -29,6 +26,9 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
+#include <condition_variable>
+#include <memory>
+
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/interop/stress_interop_client.cc b/test/cpp/interop/stress_interop_client.cc
index 0ccacfaefb1..cf92bd1ba8b 100644
--- a/test/cpp/interop/stress_interop_client.cc
+++ b/test/cpp/interop/stress_interop_client.cc
@@ -18,6 +18,8 @@
 
 #include "test/cpp/interop/stress_interop_client.h"
 
+#include <grpcpp/create_channel.h>
+
 #include <memory>
 #include <string>
 #include <vector>
@@ -25,9 +27,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpcpp/create_channel.h>
-
 #include "src/core/util/crash.h"
 #include "test/cpp/interop/interop_client.h"
 #include "test/cpp/util/metrics_server.h"
diff --git a/test/cpp/interop/stress_interop_client.h b/test/cpp/interop/stress_interop_client.h
index cdc8bf91727..4744bed86c4 100644
--- a/test/cpp/interop/stress_interop_client.h
+++ b/test/cpp/interop/stress_interop_client.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CPP_INTEROP_STRESS_INTEROP_CLIENT_H
 #define GRPC_TEST_CPP_INTEROP_STRESS_INTEROP_CLIENT_H
 
+#include <grpcpp/create_channel.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <grpcpp/create_channel.h>
-
 #include "test/cpp/interop/interop_client.h"
 #include "test/cpp/util/metrics_server.h"
 
diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc
index 3f27484111c..addf9bfb14f 100644
--- a/test/cpp/interop/stress_test.cc
+++ b/test/cpp/interop/stress_test.cc
@@ -16,6 +16,9 @@
 // is % allowed in string
 //
 
+#include <grpc/support/time.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/grpcpp.h>
 #include <limits.h>
 
 #include <memory>
@@ -28,11 +31,6 @@
 #include "absl/log/check.h"
 #include "absl/log/globals.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
diff --git a/test/cpp/interop/xds_federation_client.cc b/test/cpp/interop/xds_federation_client.cc
index 8c8c4ffc6b7..2edbf491815 100644
--- a/test/cpp/interop/xds_federation_client.cc
+++ b/test/cpp/interop/xds_federation_client.cc
@@ -16,6 +16,9 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+
 #include <memory>
 #include <thread>
 
@@ -23,10 +26,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_split.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/util/string.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/interop/client_helper.h"
diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc
index f3af46b19f2..d2296032267 100644
--- a/test/cpp/interop/xds_interop_client.cc
+++ b/test/cpp/interop/xds_interop_client.cc
@@ -16,6 +16,14 @@
 //
 //
 
+#include <grpcpp/ext/admin_services.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/ext/proto_server_reflection_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -38,15 +46,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpcpp/ext/admin_services.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/ext/proto_server_reflection_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/empty.pb.h"
diff --git a/test/cpp/interop/xds_interop_server.cc b/test/cpp/interop/xds_interop_server.cc
index eb2fa7ad08f..8d70944b4e7 100644
--- a/test/cpp/interop/xds_interop_server.cc
+++ b/test/cpp/interop/xds_interop_server.cc
@@ -16,6 +16,10 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/health_check_service_interface.h>
+
 #include <iostream>
 
 #include "absl/flags/flag.h"
@@ -23,11 +27,6 @@
 #include "opentelemetry/exporters/prometheus/exporter_factory.h"
 #include "opentelemetry/exporters/prometheus/exporter_options.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/ext/csm_observability.h>
-#include <grpcpp/health_check_service_interface.h>
-
 #include "src/core/util/gethostname.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/interop/xds_interop_server_lib.h"
diff --git a/test/cpp/interop/xds_interop_server_lib.cc b/test/cpp/interop/xds_interop_server_lib.cc
index 6a4202ff9fa..5a7d4ce3f2c 100644
--- a/test/cpp/interop/xds_interop_server_lib.cc
+++ b/test/cpp/interop/xds_interop_server_lib.cc
@@ -18,12 +18,6 @@
 
 #include "test/cpp/interop/xds_interop_server_lib.h"
 
-#include <memory>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_split.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
 #include <grpcpp/ext/admin_services.h>
@@ -33,6 +27,11 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/xds_server_builder.h>
 
+#include <memory>
+
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_split.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
diff --git a/test/cpp/interop/xds_interop_server_lib.h b/test/cpp/interop/xds_interop_server_lib.h
index 01e0b6185b9..5d99413ba55 100644
--- a/test/cpp/interop/xds_interop_server_lib.h
+++ b/test/cpp/interop/xds_interop_server_lib.h
@@ -18,11 +18,11 @@
 
 #ifndef GRPC_TEST_CPP_INTEROP_XDS_INTEROP_SERVER_LIB_H
 #define GRPC_TEST_CPP_INTEROP_XDS_INTEROP_SERVER_LIB_H
+#include <grpcpp/server.h>
+
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
-#include <grpcpp/server.h>
-
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/interop/xds_interop_server_test.cc b/test/cpp/interop/xds_interop_server_test.cc
index 808924ed0b3..8aeb6e948a4 100644
--- a/test/cpp/interop/xds_interop_server_test.cc
+++ b/test/cpp/interop/xds_interop_server_test.cc
@@ -14,16 +14,14 @@
 // limitations under the License.
 //
 
-#include <thread>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "absl/strings/str_format.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
 
+#include <thread>
+
+#include "absl/strings/str_format.h"
 #include "src/core/util/sync.h"
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
diff --git a/test/cpp/interop/xds_stats_watcher.h b/test/cpp/interop/xds_stats_watcher.h
index 530358dadab..5d92f8517f2 100644
--- a/test/cpp/interop/xds_stats_watcher.h
+++ b/test/cpp/interop/xds_stats_watcher.h
@@ -19,6 +19,8 @@
 #ifndef GRPC_TEST_CPP_INTEROP_XDS_STATS_WATCHER_H
 #define GRPC_TEST_CPP_INTEROP_XDS_STATS_WATCHER_H
 
+#include <grpcpp/grpcpp.h>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -34,9 +36,6 @@
 
 #include "absl/status/status.h"
 #include "absl/types/span.h"
-
-#include <grpcpp/grpcpp.h>
-
 #include "src/proto/grpc/testing/empty.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
 
diff --git a/test/cpp/interop/xds_stats_watcher_test.cc b/test/cpp/interop/xds_stats_watcher_test.cc
index 6f29c96002c..65ef8568984 100644
--- a/test/cpp/interop/xds_stats_watcher_test.cc
+++ b/test/cpp/interop/xds_stats_watcher_test.cc
@@ -16,13 +16,12 @@
 
 #include "test/cpp/interop/xds_stats_watcher.h"
 
-#include <map>
-#include <memory>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
 #include <gtest/gtest.h>
 
-#include <grpc/grpc.h>
+#include <map>
+#include <memory>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/microbenchmarks/bm_alarm.cc b/test/cpp/microbenchmarks/bm_alarm.cc
index f72220e9aa6..b64d670129b 100644
--- a/test/cpp/microbenchmarks/bm_alarm.cc
+++ b/test/cpp/microbenchmarks/bm_alarm.cc
@@ -19,7 +19,6 @@
 // This benchmark exists to ensure that immediately-firing alarms are fast
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/alarm.h>
 #include <grpcpp/completion_queue.h>
diff --git a/test/cpp/microbenchmarks/bm_basic_work_queue.cc b/test/cpp/microbenchmarks/bm_basic_work_queue.cc
index c84cd3d1829..c0188e6cb98 100644
--- a/test/cpp/microbenchmarks/bm_basic_work_queue.cc
+++ b/test/cpp/microbenchmarks/bm_basic_work_queue.cc
@@ -11,15 +11,13 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include <deque>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/port_platform.h>
 
+#include <deque>
+
+#include "absl/log/check.h"
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/work_queue/basic_work_queue.h"
 #include "src/core/util/sync.h"
diff --git a/test/cpp/microbenchmarks/bm_byte_buffer.cc b/test/cpp/microbenchmarks/bm_byte_buffer.cc
index 0de947fbec3..8b0c9a302a8 100644
--- a/test/cpp/microbenchmarks/bm_byte_buffer.cc
+++ b/test/cpp/microbenchmarks/bm_byte_buffer.cc
@@ -18,18 +18,16 @@
 
 // This benchmark exists to show that byte-buffer copy is size-independent
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/byte_buffer_reader.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/microbenchmarks/helpers.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/microbenchmarks/bm_channel.cc b/test/cpp/microbenchmarks/bm_channel.cc
index 45fc8b64852..7e11dfa14dc 100644
--- a/test/cpp/microbenchmarks/bm_channel.cc
+++ b/test/cpp/microbenchmarks/bm_channel.cc
@@ -19,7 +19,6 @@
 // Benchmark channel
 
 #include <benchmark/benchmark.h>
-
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
diff --git a/test/cpp/microbenchmarks/bm_channel_args.cc b/test/cpp/microbenchmarks/bm_channel_args.cc
index f68c2a05428..3ccdcd2039b 100644
--- a/test/cpp/microbenchmarks/bm_channel_args.cc
+++ b/test/cpp/microbenchmarks/bm_channel_args.cc
@@ -15,14 +15,12 @@
 // Benchmark ChannelArgs comparison performance between grpc_channel_args and
 // grpc_core::ChannelArgs
 
-#include <random>
-
 #include <benchmark/benchmark.h>
-
-#include "absl/container/btree_map.h"
-
 #include <grpcpp/support/channel_arguments.h>
 
+#include <random>
+
+#include "absl/container/btree_map.h"
 #include "src/core/lib/channel/channel_args.h"
 
 const char kKey[] = "a very long key";
diff --git a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
index 90d4ccee01f..37006f4eede 100644
--- a/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
+++ b/test/cpp/microbenchmarks/bm_chttp2_hpack.cc
@@ -18,20 +18,17 @@
 
 // Microbenchmarks around CHTTP2 HPACK operations
 
+#include <benchmark/benchmark.h>
+#include <grpc/slice.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <memory>
 #include <sstream>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/random/random.h"
-
-#include <grpc/slice.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
diff --git a/test/cpp/microbenchmarks/bm_closure.cc b/test/cpp/microbenchmarks/bm_closure.cc
index 1622cc2fc93..41ae38416d0 100644
--- a/test/cpp/microbenchmarks/bm_closure.cc
+++ b/test/cpp/microbenchmarks/bm_closure.cc
@@ -18,12 +18,11 @@
 
 // Test various closure related operations
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
-
 #include <grpc/grpc.h>
 
+#include <sstream>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/combiner.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
diff --git a/test/cpp/microbenchmarks/bm_cq.cc b/test/cpp/microbenchmarks/bm_cq.cc
index 6b490df906b..c84a974babe 100644
--- a/test/cpp/microbenchmarks/bm_cq.cc
+++ b/test/cpp/microbenchmarks/bm_cq.cc
@@ -20,13 +20,11 @@
 // working
 
 #include <benchmark/benchmark.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include "absl/log/check.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
index f504af9f5fe..8acdb307950 100644
--- a/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
+++ b/test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
@@ -16,18 +16,15 @@
 //
 //
 
+#include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
 #include <string.h>
 
 #include <atomic>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/surface/completion_queue.h"
diff --git a/test/cpp/microbenchmarks/bm_event_engine_run.cc b/test/cpp/microbenchmarks/bm_event_engine_run.cc
index 5f70aea856f..752d9d440e9 100644
--- a/test/cpp/microbenchmarks/bm_event_engine_run.cc
+++ b/test/cpp/microbenchmarks/bm_event_engine_run.cc
@@ -12,21 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+#include <grpc/event_engine/event_engine.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include <atomic>
 #include <cmath>
 #include <memory>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/debugging/leak_check.h"
 #include "absl/functional/any_invocable.h"
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/event_engine/event_engine.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/microbenchmarks/bm_exec_ctx.cc b/test/cpp/microbenchmarks/bm_exec_ctx.cc
index 4a464856764..f90c558976a 100644
--- a/test/cpp/microbenchmarks/bm_exec_ctx.cc
+++ b/test/cpp/microbenchmarks/bm_exec_ctx.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <atomic>
-#include <memory>
-
 #include <benchmark/benchmark.h>
-
 #include <grpcpp/impl/grpc_library.h>
 
+#include <atomic>
+#include <memory>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/util/notification.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/microbenchmarks/bm_huffman_decode.cc b/test/cpp/microbenchmarks/bm_huffman_decode.cc
index 59a684f1298..770082666a5 100644
--- a/test/cpp/microbenchmarks/bm_huffman_decode.cc
+++ b/test/cpp/microbenchmarks/bm_huffman_decode.cc
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+
 #include <cstdint>
 #include <random>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/strings/escaping.h"
-
 #include "src/core/ext/transport/chttp2/transport/bin_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/decode_huff.h"
 #include "src/core/lib/slice/slice.h"
diff --git a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
index e2d2adebbe6..8e85213182b 100644
--- a/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
+++ b/test/cpp/microbenchmarks/bm_opencensus_plugin.cc
@@ -16,19 +16,17 @@
 //
 //
 
+#include <benchmark/benchmark.h>
+#include <grpc/grpc.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/opencensus.h>
+
 #include <string>
 #include <thread>  // NOLINT
 
-#include <benchmark/benchmark.h>
-
 #include "absl/base/call_once.h"
 #include "absl/strings/str_cat.h"
 #include "opencensus/stats/stats.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/opencensus.h>
-
 #include "src/core/lib/config/core_configuration.h"
 #include "src/cpp/ext/filters/census/grpc_plugin.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/microbenchmarks/bm_rng.cc b/test/cpp/microbenchmarks/bm_rng.cc
index bf84e39910e..fe34430b8e0 100644
--- a/test/cpp/microbenchmarks/bm_rng.cc
+++ b/test/cpp/microbenchmarks/bm_rng.cc
@@ -21,7 +21,6 @@
 #include <benchmark/benchmark.h>
 
 #include "absl/random/random.h"
-
 #include "src/core/util/sync.h"
 
 static void BM_OneRngFromFreshBitSet(benchmark::State& state) {
diff --git a/test/cpp/microbenchmarks/bm_stats_plugin.cc b/test/cpp/microbenchmarks/bm_stats_plugin.cc
index abc55bf80c2..39dfae190d4 100644
--- a/test/cpp/microbenchmarks/bm_stats_plugin.cc
+++ b/test/cpp/microbenchmarks/bm_stats_plugin.cc
@@ -12,16 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <memory>
-
 #include <benchmark/benchmark.h>
+#include <grpcpp/ext/otel_plugin.h>
+
+#include <memory>
 
 #include "absl/log/absl_check.h"
 #include "absl/strings/string_view.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
-
-#include <grpcpp/ext/otel_plugin.h>
-
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/telemetry/metrics.h"
 #include "test/core/test_util/fake_stats_plugin.h"
diff --git a/test/cpp/microbenchmarks/bm_thread_pool.cc b/test/cpp/microbenchmarks/bm_thread_pool.cc
index 620a7ce7d1c..a185c361451 100644
--- a/test/cpp/microbenchmarks/bm_thread_pool.cc
+++ b/test/cpp/microbenchmarks/bm_thread_pool.cc
@@ -12,19 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <benchmark/benchmark.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/impl/grpc_library.h>
+
 #include <atomic>
 #include <cmath>
 #include <memory>
 #include <vector>
 
-#include <benchmark/benchmark.h>
-
 #include "absl/log/check.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/cpu.h>
-#include <grpcpp/impl/grpc_library.h>
-
 #include "src/core/lib/event_engine/common_closures.h"
 #include "src/core/lib/event_engine/thread_pool/thread_pool.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h
index 7987200a245..54deee57868 100644
--- a/test/cpp/microbenchmarks/callback_streaming_ping_pong.h
+++ b/test/cpp/microbenchmarks/callback_streaming_ping_pong.h
@@ -19,13 +19,12 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_STREAMING_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
+#include <sstream>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/callback_test_service.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
diff --git a/test/cpp/microbenchmarks/callback_test_service.h b/test/cpp/microbenchmarks/callback_test_service.h
index bf907d22c49..09ea69ed8f6 100644
--- a/test/cpp/microbenchmarks/callback_test_service.h
+++ b/test/cpp/microbenchmarks/callback_test_service.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_TEST_SERVICE_H
 
+#include <benchmark/benchmark.h>
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <sstream>
 
-#include <benchmark/benchmark.h>
-
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/util/string_ref_helper.h"
 
diff --git a/test/cpp/microbenchmarks/callback_unary_ping_pong.h b/test/cpp/microbenchmarks/callback_unary_ping_pong.h
index a7188fc1f0d..7f139342da8 100644
--- a/test/cpp/microbenchmarks/callback_unary_ping_pong.h
+++ b/test/cpp/microbenchmarks/callback_unary_ping_pong.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_CALLBACK_UNARY_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/callback_test_service.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
diff --git a/test/cpp/microbenchmarks/fullstack_fixtures.h b/test/cpp/microbenchmarks/fullstack_fixtures.h
index 79e48ae646b..56c205466b4 100644
--- a/test/cpp/microbenchmarks/fullstack_fixtures.h
+++ b/test/cpp/microbenchmarks/fullstack_fixtures.h
@@ -19,8 +19,6 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_FIXTURES_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_FIXTURES_H
 
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/atm.h>
 #include <grpcpp/channel.h>
@@ -30,6 +28,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
+#include "absl/log/check.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
index 6fd8ba807fe..fd2e0a001c6 100644
--- a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
+++ b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
 #include "test/cpp/microbenchmarks/fullstack_fixtures.h"
diff --git a/test/cpp/microbenchmarks/fullstack_streaming_pump.h b/test/cpp/microbenchmarks/fullstack_streaming_pump.h
index df0953fd9b0..70187affb2f 100644
--- a/test/cpp/microbenchmarks/fullstack_streaming_pump.h
+++ b/test/cpp/microbenchmarks/fullstack_streaming_pump.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_STREAMING_PUMP_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
 #include "test/cpp/microbenchmarks/fullstack_fixtures.h"
diff --git a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h
index f6a7c8b88aa..5ef7a3f22f1 100644
--- a/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h
+++ b/test/cpp/microbenchmarks/fullstack_unary_ping_pong.h
@@ -21,12 +21,11 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_FULLSTACK_UNARY_PING_PONG_H
 
-#include <sstream>
-
 #include <benchmark/benchmark.h>
 
-#include "absl/log/check.h"
+#include <sstream>
 
+#include "absl/log/check.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/cpp/microbenchmarks/fullstack_context_mutators.h"
 #include "test/cpp/microbenchmarks/fullstack_fixtures.h"
diff --git a/test/cpp/microbenchmarks/helpers.h b/test/cpp/microbenchmarks/helpers.h
index 34105a98d63..99400c05034 100644
--- a/test/cpp/microbenchmarks/helpers.h
+++ b/test/cpp/microbenchmarks/helpers.h
@@ -19,14 +19,13 @@
 #ifndef GRPC_TEST_CPP_MICROBENCHMARKS_HELPERS_H
 #define GRPC_TEST_CPP_MICROBENCHMARKS_HELPERS_H
 
-#include <sstream>
-#include <vector>
-
 #include <benchmark/benchmark.h>
-
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/grpc_library.h>
 
+#include <sstream>
+#include <vector>
+
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
 
diff --git a/test/cpp/naming/address_sorting_test.cc b/test/cpp/naming/address_sorting_test.cc
index e1fa4111ed6..00a55c37d7c 100644
--- a/test/cpp/naming/address_sorting_test.cc
+++ b/test/cpp/naming/address_sorting_test.cc
@@ -16,23 +16,20 @@
 //
 //
 
-#include <string.h>
-#include <sys/types.h>
-
-#include <vector>
-
 #include <address_sorting/address_sorting.h>
 #include <gmock/gmock.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
+#include <string.h>
+#include <sys/types.h>
 
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
diff --git a/test/cpp/naming/cancel_ares_query_test.cc b/test/cpp/naming/cancel_ares_query_test.cc
index b77330ee595..cb05f8d9030 100644
--- a/test/cpp/naming/cancel_ares_query_test.cc
+++ b/test/cpp/naming/cancel_ares_query_test.cc
@@ -16,24 +16,21 @@
 //
 //
 
-#include <stdio.h>
-#include <string.h>
-
-#include <string>
-
 #include <gmock/gmock.h>
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-
 #include <grpc/byte_buffer.h>
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/time.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <string>
 
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/cpp/naming/resolver_component_test.cc b/test/cpp/naming/resolver_component_test.cc
index f5a4984e98c..050e42dd00e 100644
--- a/test/cpp/naming/resolver_component_test.cc
+++ b/test/cpp/naming/resolver_component_test.cc
@@ -18,28 +18,25 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/impl/grpc_types.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/port_platform.h>
+#include <grpc/support/sync.h>
+#include <grpc/support/time.h>
 #include <string.h>
 
 #include <string>
 #include <thread>
 #include <vector>
 
-#include <gmock/gmock.h>
-
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/impl/grpc_types.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/sync.h>
-#include <grpc/support/time.h>
-
 #include "src/core/client_channel/client_channel_filter.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
index 26fe87fb600..4c095a7d4bf 100644
--- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc
+++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
@@ -12,15 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <grpc/support/port_platform.h>
 #include <signal.h>
 #include <string.h>
 
-#include <grpc/support/port_platform.h>
-
 #ifndef GPR_WINDOWS
 #include <unistd.h>
 #endif  // GPR_WINDOWS
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+
 #include <memory>
 #include <string>
 #include <thread>
@@ -30,11 +33,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
 #include "src/core/util/crash.h"
 
 #ifdef __FreeBSD__
diff --git a/test/cpp/performance/writes_per_rpc_test.cc b/test/cpp/performance/writes_per_rpc_test.cc
index d540c21a225..c171daeebd6 100644
--- a/test/cpp/performance/writes_per_rpc_test.cc
+++ b/test/cpp/performance/writes_per_rpc_test.cc
@@ -16,14 +16,6 @@
 //
 //
 
-#include <chrono>
-#include <utility>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
 #include <grpcpp/channel.h>
 #include <grpcpp/create_channel.h>
 #include <grpcpp/impl/grpc_library.h>
@@ -31,7 +23,13 @@
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
+#include <gtest/gtest.h>
 
+#include <chrono>
+#include <utility>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
diff --git a/test/cpp/qps/benchmark_config.cc b/test/cpp/qps/benchmark_config.cc
index 58b4f57be42..007480fe994 100644
--- a/test/cpp/qps/benchmark_config.cc
+++ b/test/cpp/qps/benchmark_config.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/qps/benchmark_config.h"
 
-#include "absl/flags/flag.h"
-#include "absl/log/check.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 #include "test/cpp/util/test_credentials_provider.h"
 
diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h
index fe66465bbce..fdc2e8bbff7 100644
--- a/test/cpp/qps/client.h
+++ b/test/cpp/qps/client.h
@@ -19,6 +19,11 @@
 #ifndef GRPC_TEST_CPP_QPS_CLIENT_H
 #define GRPC_TEST_CPP_QPS_CLIENT_H
 
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/support/byte_buffer.h>
+#include <grpcpp/support/channel_arguments.h>
+#include <grpcpp/support/slice.h>
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -33,13 +38,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
-
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/support/byte_buffer.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <grpcpp/support/slice.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index 889d935f989..855859159cf 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.cc
@@ -16,6 +16,13 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/generic/generic_stub.h>
+
 #include <forward_list>
 #include <functional>
 #include <list>
@@ -30,14 +37,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/cpu.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/generic/generic_stub.h>
-
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
diff --git a/test/cpp/qps/client_callback.cc b/test/cpp/qps/client_callback.cc
index 29a35676aa4..d34373def15 100644
--- a/test/cpp/qps/client_callback.cc
+++ b/test/cpp/qps/client_callback.cc
@@ -16,6 +16,12 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+
 #include <list>
 #include <memory>
 #include <mutex>
@@ -27,13 +33,6 @@
 
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/cpu.h>
-#include <grpcpp/alarm.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/client.h"
diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc
index 23778475ac7..fd2c6d17589 100644
--- a/test/cpp/qps/client_sync.cc
+++ b/test/cpp/qps/client_sync.cc
@@ -16,6 +16,14 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/time.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+
 #include <chrono>
 #include <memory>
 #include <mutex>
@@ -26,15 +34,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/time.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/client.h"
diff --git a/test/cpp/qps/driver.cc b/test/cpp/qps/driver.cc
index 3f015de1236..a2dee89e905 100644
--- a/test/cpp/qps/driver.cc
+++ b/test/cpp/qps/driver.cc
@@ -18,6 +18,12 @@
 
 #include "test/cpp/qps/driver.h"
 
+#include <grpc/support/alloc.h>
+#include <grpc/support/string_util.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+
 #include <cinttypes>
 #include <deque>
 #include <list>
@@ -28,13 +34,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "google/protobuf/timestamp.pb.h"
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "src/core/util/host_port.h"
diff --git a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc
index 57e826a5dff..766e555c7aa 100644
--- a/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc
+++ b/test/cpp/qps/inproc_sync_unary_ping_pong_test.cc
@@ -19,7 +19,6 @@
 #include <set>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/interarrival.h b/test/cpp/qps/interarrival.h
index 3d11b208cba..59af99f2ca1 100644
--- a/test/cpp/qps/interarrival.h
+++ b/test/cpp/qps/interarrival.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_QPS_INTERARRIVAL_H
 #define GRPC_TEST_CPP_QPS_INTERARRIVAL_H
 
+#include <grpcpp/support/config.h>
+
 #include <chrono>
 #include <cmath>
 #include <random>
 #include <vector>
 
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/qps/json_run_localhost.cc b/test/cpp/qps/json_run_localhost.cc
index 59d46414bca..c577328637b 100644
--- a/test/cpp/qps/json_run_localhost.cc
+++ b/test/cpp/qps/json_run_localhost.cc
@@ -30,7 +30,6 @@
 
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "src/core/util/env.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/qps/parse_json.cc b/test/cpp/qps/parse_json.cc
index 0b6af9f962d..2a28339d384 100644
--- a/test/cpp/qps/parse_json.cc
+++ b/test/cpp/qps/parse_json.cc
@@ -23,7 +23,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/strings/str_format.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc
index c11e9f2bd81..4614eacf663 100644
--- a/test/cpp/qps/qps_json_driver.cc
+++ b/test/cpp/qps/qps_json_driver.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpcpp/impl/codegen/config_protobuf.h>
+
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -24,9 +26,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/qps_openloop_test.cc b/test/cpp/qps/qps_openloop_test.cc
index 92db5ef53c4..5335aab7689 100644
--- a/test/cpp/qps/qps_openloop_test.cc
+++ b/test/cpp/qps/qps_openloop_test.cc
@@ -19,7 +19,6 @@
 #include <set>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/qps_server_builder.h b/test/cpp/qps/qps_server_builder.h
index bf604c00d27..f5f5a6f6180 100644
--- a/test/cpp/qps/qps_server_builder.h
+++ b/test/cpp/qps/qps_server_builder.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CPP_QPS_QPS_SERVER_BUILDER_H
 #define GRPC_TEST_CPP_QPS_QPS_SERVER_BUILDER_H
 
+#include <grpcpp/server_builder.h>
+
 #include <functional>
 #include <memory>
 
-#include <grpcpp/server_builder.h>
-
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc
index 4f396456c51..7dff6a20c0a 100644
--- a/test/cpp/qps/qps_worker.cc
+++ b/test/cpp/qps/qps_worker.cc
@@ -18,6 +18,14 @@
 
 #include "test/cpp/qps/qps_worker.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/alloc.h>
+#include <grpc/support/cpu.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+
 #include <memory>
 #include <mutex>
 #include <sstream>
@@ -28,15 +36,6 @@
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/cpu.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-
 #include "src/core/util/crash.h"
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/worker_service.grpc.pb.h"
diff --git a/test/cpp/qps/qps_worker.h b/test/cpp/qps/qps_worker.h
index b0c5af09566..ad8956bf5b3 100644
--- a/test/cpp/qps/qps_worker.h
+++ b/test/cpp/qps/qps_worker.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_QPS_QPS_WORKER_H
 #define GRPC_TEST_CPP_QPS_QPS_WORKER_H
 
-#include <memory>
-
 #include <grpc/support/atm.h>
 #include <grpcpp/server.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/config.h>
 
+#include <memory>
+
 #include "test/cpp/qps/server.h"
 
 namespace grpc {
diff --git a/test/cpp/qps/report.cc b/test/cpp/qps/report.cc
index e0b0cd646b2..0b3784e4885 100644
--- a/test/cpp/qps/report.cc
+++ b/test/cpp/qps/report.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/qps/report.h"
 
+#include <grpcpp/client_context.h>
+
 #include <fstream>
 
 #include "absl/log/log.h"
-
-#include <grpcpp/client_context.h>
-
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h"
 #include "test/cpp/qps/driver.h"
diff --git a/test/cpp/qps/report.h b/test/cpp/qps/report.h
index 30539e73f1b..0478a171126 100644
--- a/test/cpp/qps/report.h
+++ b/test/cpp/qps/report.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_QPS_REPORT_H
 #define GRPC_TEST_CPP_QPS_REPORT_H
 
+#include <grpcpp/channel.h>
+#include <grpcpp/support/config.h>
+
 #include <memory>
 #include <set>
 #include <vector>
 
-#include <grpcpp/channel.h>
-#include <grpcpp/support/config.h>
-
 #include "src/proto/grpc/testing/report_qps_scenario_service.grpc.pb.h"
 #include "test/cpp/qps/driver.h"
 
diff --git a/test/cpp/qps/scenario_runner.cc b/test/cpp/qps/scenario_runner.cc
index 7ca32f983ca..220a65697fd 100644
--- a/test/cpp/qps/scenario_runner.cc
+++ b/test/cpp/qps/scenario_runner.cc
@@ -14,7 +14,6 @@
 
 #include "absl/flags/flag.h"
 #include "absl/log/log.h"
-
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/telemetry/stats.h"
 #include "src/core/telemetry/stats_data.h"
diff --git a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
index d64d40c8e8a..091502f96e3 100644
--- a/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
+++ b/test/cpp/qps/secure_sync_unary_ping_pong_test.cc
@@ -19,7 +19,6 @@
 #include <set>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/benchmark_config.h"
diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h
index 98d0ee1dd6d..4edf5b7531b 100644
--- a/test/cpp/qps/server.h
+++ b/test/cpp/qps/server.h
@@ -19,16 +19,15 @@
 #ifndef GRPC_TEST_CPP_QPS_SERVER_H
 #define GRPC_TEST_CPP_QPS_SERVER_H
 
-#include <vector>
-
-#include "absl/log/log.h"
-
 #include <grpc/support/cpu.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/resource_quota.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server_builder.h>
 
+#include <vector>
+
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/control.pb.h"
 #include "src/proto/grpc/testing/messages.pb.h"
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index f091c11d69b..2e290ca7e3e 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.cc
@@ -16,15 +16,6 @@
 //
 //
 
-#include <algorithm>
-#include <forward_list>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <thread>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/generic/async_generic_service.h>
@@ -35,6 +26,14 @@
 #include <grpcpp/server_context.h>
 #include <grpcpp/support/config.h>
 
+#include <algorithm>
+#include <forward_list>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/lib/surface/completion_queue.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/host_port.h"
diff --git a/test/cpp/qps/server_callback.cc b/test/cpp/qps/server_callback.cc
index 07c65226872..a3f56541d93 100644
--- a/test/cpp/qps/server_callback.cc
+++ b/test/cpp/qps/server_callback.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_context.h>
 
+#include "absl/log/log.h"
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/qps_server_builder.h"
diff --git a/test/cpp/qps/server_sync.cc b/test/cpp/qps/server_sync.cc
index fe9f8274f52..54aaee5d245 100644
--- a/test/cpp/qps/server_sync.cc
+++ b/test/cpp/qps/server_sync.cc
@@ -16,17 +16,16 @@
 //
 //
 
-#include <atomic>
-#include <thread>
-
-#include "absl/log/log.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_context.h>
 
+#include <atomic>
+#include <thread>
+
+#include "absl/log/log.h"
 #include "src/core/util/host_port.h"
 #include "src/proto/grpc/testing/benchmark_service.grpc.pb.h"
 #include "test/cpp/qps/qps_server_builder.h"
diff --git a/test/cpp/qps/usage_timer.cc b/test/cpp/qps/usage_timer.cc
index 9bea4846a4f..a44527700a6 100644
--- a/test/cpp/qps/usage_timer.cc
+++ b/test/cpp/qps/usage_timer.cc
@@ -18,14 +18,13 @@
 
 #include "test/cpp/qps/usage_timer.h"
 
+#include <grpc/support/time.h>
+
 #include <fstream>
 #include <sstream>
 #include <string>
 
 #include "absl/log/log.h"
-
-#include <grpc/support/time.h>
-
 #include "src/core/util/crash.h"
 #ifdef __linux__
 #include <sys/resource.h>
diff --git a/test/cpp/qps/worker.cc b/test/cpp/qps/worker.cc
index e7aaaf70389..54f08f9a98a 100644
--- a/test/cpp/qps/worker.cc
+++ b/test/cpp/qps/worker.cc
@@ -16,6 +16,8 @@
 //
 //
 
+#include <grpc/grpc.h>
+#include <grpc/support/time.h>
 #include <signal.h>
 
 #include <chrono>
@@ -23,10 +25,6 @@
 #include <vector>
 
 #include "absl/flags/flag.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/time.h>
-
 #include "test/core/test_util/test_config.h"
 #include "test/cpp/qps/qps_worker.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/security/tls_certificate_verifier_test.cc b/test/cpp/security/tls_certificate_verifier_test.cc
index 2b370c03667..c0cfa10adfb 100644
--- a/test/cpp/security/tls_certificate_verifier_test.cc
+++ b/test/cpp/security/tls_certificate_verifier_test.cc
@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include <memory>
-
 #include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/security/tls_credentials_options.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/cpp/client/secure_credentials.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/server/authorization_policy_provider_test.cc b/test/cpp/server/authorization_policy_provider_test.cc
index 25784cbb6b5..573f7dec763 100644
--- a/test/cpp/server/authorization_policy_provider_test.cc
+++ b/test/cpp/server/authorization_policy_provider_test.cc
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/security/authorization_policy_provider.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
diff --git a/test/cpp/server/credentials_test.cc b/test/cpp/server/credentials_test.cc
index 32f14c38752..c7d395bf252 100644
--- a/test/cpp/server/credentials_test.cc
+++ b/test/cpp/server/credentials_test.cc
@@ -14,19 +14,17 @@
 // limitations under the License.
 //
 
-#include <memory>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_crl_provider.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/security/tls_credentials_options.h>
 #include <grpcpp/security/tls_crl_provider.h>
+#include <gtest/gtest.h>
 
+#include <memory>
+
+#include "absl/log/check.h"
 #include "test/core/test_util/test_config.h"
 #include "test/core/test_util/tls_utils.h"
 #include "test/cpp/util/tls_test_utils.h"
diff --git a/test/cpp/server/load_reporter/get_cpu_stats_test.cc b/test/cpp/server/load_reporter/get_cpu_stats_test.cc
index 3f35adba2de..744c4e0968e 100644
--- a/test/cpp/server/load_reporter/get_cpu_stats_test.cc
+++ b/test/cpp/server/load_reporter/get_cpu_stats_test.cc
@@ -18,10 +18,9 @@
 
 #include "src/cpp/server/load_reporter/get_cpu_stats.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/port.h"
 #include "test/core/test_util/test_config.h"
diff --git a/test/cpp/server/load_reporter/load_data_store_test.cc b/test/cpp/server/load_reporter/load_data_store_test.cc
index a850de29d75..454a9b6a161 100644
--- a/test/cpp/server/load_reporter/load_data_store_test.cc
+++ b/test/cpp/server/load_reporter/load_data_store_test.cc
@@ -18,13 +18,12 @@
 
 #include "src/cpp/server/load_reporter/load_data_store.h"
 
-#include <set>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
+#include <gtest/gtest.h>
+
+#include <set>
+#include <vector>
 
 #include "src/cpp/server/load_reporter/constants.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/server/load_reporter/load_reporter_test.cc b/test/cpp/server/load_reporter/load_reporter_test.cc
index fd1d4aeef67..c04e1dbb78f 100644
--- a/test/cpp/server/load_reporter/load_reporter_test.cc
+++ b/test/cpp/server/load_reporter/load_reporter_test.cc
@@ -18,20 +18,18 @@
 
 #include "src/cpp/server/load_reporter/load_reporter.h"
 
-#include <set>
-#include <vector>
-
 #include <gmock/gmock.h>
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
 #include <gtest/gtest.h>
 
+#include <set>
+#include <vector>
+
 #include "absl/log/check.h"
 #include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "opencensus/stats/testing/test_utils.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/cpp/server/load_reporter/constants.h"
diff --git a/test/cpp/server/server_builder_test.cc b/test/cpp/server/server_builder_test.cc
index 73e02cedbde..c32f55082a4 100644
--- a/test/cpp/server/server_builder_test.cc
+++ b/test/cpp/server/server_builder_test.cc
@@ -16,15 +16,13 @@
 //
 //
 
-#include <sys/socket.h>
-
-#include <gtest/gtest.h>
-
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/grpc.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
+#include <sys/socket.h>
 
 #include "src/core/util/notification.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/server/server_builder_with_socket_mutator_test.cc b/test/cpp/server/server_builder_with_socket_mutator_test.cc
index e9e148c7793..065f8a8f163 100644
--- a/test/cpp/server/server_builder_with_socket_mutator_test.cc
+++ b/test/cpp/server/server_builder_with_socket_mutator_test.cc
@@ -16,14 +16,13 @@
 //
 //
 
-#include <memory>
-
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
+
+#include <memory>
 
 #include "src/core/lib/iomgr/socket_mutator.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
diff --git a/test/cpp/server/server_request_call_test.cc b/test/cpp/server/server_request_call_test.cc
index bf781e3e2bf..d32765308ac 100644
--- a/test/cpp/server/server_request_call_test.cc
+++ b/test/cpp/server/server_request_call_test.cc
@@ -16,19 +16,17 @@
 //
 //
 
-#include <thread>
-
-#include <gtest/gtest.h>
-
-#include "absl/log/log.h"
-#include "absl/strings/str_format.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
+
+#include <thread>
 
+#include "absl/log/log.h"
+#include "absl/strings/str_format.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/test/client_context_test_peer_test.cc b/test/cpp/test/client_context_test_peer_test.cc
index ee1347cdb21..93295f53918 100644
--- a/test/cpp/test/client_context_test_peer_test.cc
+++ b/test/cpp/test/client_context_test_peer_test.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <cstring>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/test/client_context_test_peer.h>
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <vector>
 
 namespace grpc {
 namespace testing {
diff --git a/test/cpp/test/mock_stream_test.cc b/test/cpp/test/mock_stream_test.cc
index f88be58c360..4b972f31b57 100644
--- a/test/cpp/test/mock_stream_test.cc
+++ b/test/cpp/test/mock_stream_test.cc
@@ -16,12 +16,10 @@
 //
 //
 
+#include <grpcpp/test/mock_stream.h>
 #include <gtest/gtest.h>
 
 #include "absl/memory/memory.h"
-
-#include <grpcpp/test/mock_stream.h>
-
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 
 using grpc::testing::EchoRequest;
diff --git a/test/cpp/test/server_context_test_spouse_test.cc b/test/cpp/test/server_context_test_spouse_test.cc
index e778484d88a..0091f101a03 100644
--- a/test/cpp/test/server_context_test_spouse_test.cc
+++ b/test/cpp/test/server_context_test_spouse_test.cc
@@ -16,13 +16,12 @@
 //
 //
 
-#include <cstring>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/test/server_context_test_spouse.h>
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <vector>
 
 namespace grpc {
 namespace testing {
diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc
index 751ab3977c6..95a392436b6 100644
--- a/test/cpp/thread_manager/thread_manager_test.cc
+++ b/test/cpp/thread_manager/thread_manager_test.cc
@@ -18,19 +18,17 @@
 
 #include "src/cpp/thread_manager/thread_manager.h"
 
+#include <grpc/support/port_platform.h>
+#include <grpcpp/grpcpp.h>
+#include <gtest/gtest.h>
+
 #include <atomic>
 #include <chrono>
 #include <climits>
 #include <memory>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include "absl/log/log.h"
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/grpcpp.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/byte_buffer_proto_helper.h b/test/cpp/util/byte_buffer_proto_helper.h
index ecc0085039a..d70167083c9 100644
--- a/test/cpp/util/byte_buffer_proto_helper.h
+++ b/test/cpp/util/byte_buffer_proto_helper.h
@@ -19,11 +19,11 @@
 #ifndef GRPC_TEST_CPP_UTIL_BYTE_BUFFER_PROTO_HELPER_H
 #define GRPC_TEST_CPP_UTIL_BYTE_BUFFER_PROTO_HELPER_H
 
-#include <memory>
-
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include <memory>
+
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/util/byte_buffer_test.cc b/test/cpp/util/byte_buffer_test.cc
index be9a4a75fc3..1dfc17169d7 100644
--- a/test/cpp/util/byte_buffer_test.cc
+++ b/test/cpp/util/byte_buffer_test.cc
@@ -16,16 +16,15 @@
 //
 //
 
-#include <cstring>
-#include <vector>
-
-#include <gtest/gtest.h>
-
 #include <grpc++/support/byte_buffer.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
 #include <grpcpp/support/slice.h>
+#include <gtest/gtest.h>
+
+#include <cstring>
+#include <vector>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/channel_trace_proto_helper.cc b/test/cpp/util/channel_trace_proto_helper.cc
index 0c11284c81a..0566a6cf566 100644
--- a/test/cpp/util/channel_trace_proto_helper.cc
+++ b/test/cpp/util/channel_trace_proto_helper.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/util/channel_trace_proto_helper.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpc/support/port_platform.h>
 #include <grpcpp/impl/codegen/config_protobuf.h>
 #include <grpcpp/support/config.h>
+#include <gtest/gtest.h>
 
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/crash.h"
diff --git a/test/cpp/util/channelz_sampler.cc b/test/cpp/util/channelz_sampler.cc
index 043625afa4d..6344dbd272c 100644
--- a/test/cpp/util/channelz_sampler.cc
+++ b/test/cpp/util/channelz_sampler.cc
@@ -15,6 +15,18 @@
 // limitations under the License.
 //
 //
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/client_context.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/ext/channelz_service_plugin.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/security/server_credentials.h>
+#include <grpcpp/server.h>
+#include <grpcpp/server_builder.h>
+#include <grpcpp/server_context.h>
 #include <unistd.h>
 
 #include <cstdlib>
@@ -32,20 +44,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "google/protobuf/text_format.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/ext/channelz_service_plugin.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/security/server_credentials.h>
-#include <grpcpp/server.h>
-#include <grpcpp/server_builder.h>
-#include <grpcpp/server_context.h>
-
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/cpp/server/channelz/channelz_service.h"
diff --git a/test/cpp/util/channelz_sampler_test.cc b/test/cpp/util/channelz_sampler_test.cc
index 5c5f1118d60..eb480e5e143 100644
--- a/test/cpp/util/channelz_sampler_test.cc
+++ b/test/cpp/util/channelz_sampler_test.cc
@@ -15,20 +15,6 @@
 // limitations under the License.
 //
 //
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <cstdlib>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/str_cat.h"
-#include "gtest/gtest.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
@@ -42,7 +28,19 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <stdlib.h>
+#include <unistd.h>
 
+#include <cstdlib>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <thread>
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "gtest/gtest.h"
 #include "src/core/util/env.h"
 #include "src/cpp/server/channelz/channelz_service.h"
 #include "src/proto/grpc/testing/test.grpc.pb.h"
diff --git a/test/cpp/util/cli_call.cc b/test/cpp/util/cli_call.cc
index 9f7df96bf8e..367669fecf1 100644
--- a/test/cpp/util/cli_call.cc
+++ b/test/cpp/util/cli_call.cc
@@ -18,18 +18,17 @@
 
 #include "test/cpp/util/cli_call.h"
 
-#include <cmath>
-#include <iostream>
-#include <utility>
-
-#include "absl/log/check.h"
-
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/support/byte_buffer.h>
 
+#include <cmath>
+#include <iostream>
+#include <utility>
+
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/test/cpp/util/cli_call.h b/test/cpp/util/cli_call.h
index f2a43f9d789..bb13e5e809c 100644
--- a/test/cpp/util/cli_call.h
+++ b/test/cpp/util/cli_call.h
@@ -19,14 +19,14 @@
 #ifndef GRPC_TEST_CPP_UTIL_CLI_CALL_H
 #define GRPC_TEST_CPP_UTIL_CLI_CALL_H
 
-#include <map>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/completion_queue.h>
 #include <grpcpp/generic/generic_stub.h>
 #include <grpcpp/support/status.h>
 #include <grpcpp/support/string_ref.h>
 
+#include <map>
+
 namespace grpc {
 
 class ClientContext;
diff --git a/test/cpp/util/cli_call_test.cc b/test/cpp/util/cli_call_test.cc
index 8e313aacd28..9a827d78ce7 100644
--- a/test/cpp/util/cli_call_test.cc
+++ b/test/cpp/util/cli_call_test.cc
@@ -18,8 +18,6 @@
 
 #include "test/cpp/util/cli_call.h"
 
-#include <gtest/gtest.h>
-
 #include <grpc/grpc.h>
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
@@ -27,6 +25,7 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
 
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/test_util/port.h"
diff --git a/test/cpp/util/cli_credentials.cc b/test/cpp/util/cli_credentials.cc
index 61e90282ae0..f3df7eb4da1 100644
--- a/test/cpp/util/cli_credentials.cc
+++ b/test/cpp/util/cli_credentials.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/util/cli_credentials.h"
 
-#include "absl/flags/flag.h"
-#include "absl/log/log.h"
-
 #include <grpc/slice.h>
 #include <grpcpp/support/slice.h>
 
+#include "absl/flags/flag.h"
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/core/util/load_file.h"
 
diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc
index 73d92b20ae4..38828ec698a 100644
--- a/test/cpp/util/create_test_channel.cc
+++ b/test/cpp/util/create_test_channel.cc
@@ -18,12 +18,11 @@
 
 #include "test/cpp/util/create_test_channel.h"
 
-#include "absl/flags/flag.h"
-#include "absl/log/check.h"
-
 #include <grpcpp/create_channel.h>
 #include <grpcpp/security/credentials.h>
 
+#include "absl/flags/flag.h"
+#include "absl/log/check.h"
 #include "src/core/util/crash.h"
 #include "test/cpp/util/test_credentials_provider.h"
 
diff --git a/test/cpp/util/create_test_channel.h b/test/cpp/util/create_test_channel.h
index 1ed9c44e491..04ea33e4607 100644
--- a/test/cpp/util/create_test_channel.h
+++ b/test/cpp/util/create_test_channel.h
@@ -19,13 +19,13 @@
 #ifndef GRPC_TEST_CPP_UTIL_CREATE_TEST_CHANNEL_H
 #define GRPC_TEST_CPP_UTIL_CREATE_TEST_CHANNEL_H
 
-#include <memory>
-
 #include <grpcpp/channel.h>
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 #include <grpcpp/support/client_interceptor.h>
 
+#include <memory>
+
 namespace grpc {
 class Channel;
 
diff --git a/test/cpp/util/error_details_test.cc b/test/cpp/util/error_details_test.cc
index 271360d66c4..0fa2ac122ce 100644
--- a/test/cpp/util/error_details_test.cc
+++ b/test/cpp/util/error_details_test.cc
@@ -16,9 +16,8 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/error_details.h>
+#include <gtest/gtest.h>
 
 #include "src/proto/grpc/status/status.pb.h"
 #include "src/proto/grpc/testing/echo_messages.pb.h"
diff --git a/test/cpp/util/grpc_cli.cc b/test/cpp/util/grpc_cli.cc
index 48d07b37c79..9790d5ec003 100644
--- a/test/cpp/util/grpc_cli.cc
+++ b/test/cpp/util/grpc_cli.cc
@@ -61,14 +61,13 @@
 //      address of the connection that each RPC is made on to stderr.
 //
 
+#include <grpcpp/support/config.h>
+
 #include <fstream>
 #include <functional>
 #include <iostream>
 
 #include "absl/flags/flag.h"
-
-#include <grpcpp/support/config.h>
-
 #include "test/cpp/util/cli_credentials.h"
 #include "test/cpp/util/grpc_tool.h"
 #include "test/cpp/util/test_config.h"
diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc
index 8f171274bb4..9040de69a9b 100644
--- a/test/cpp/util/grpc_tool.cc
+++ b/test/cpp/util/grpc_tool.cc
@@ -18,6 +18,14 @@
 
 #include "test/cpp/util/grpc_tool.h"
 
+#include <grpc/grpc.h>
+#include <grpc/support/port_platform.h>
+#include <grpcpp/channel.h>
+#include <grpcpp/create_channel.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/security/credentials.h>
+#include <grpcpp/support/string_ref.h>
+
 #include <cstdio>
 #include <fstream>
 #include <iostream>
@@ -31,15 +39,6 @@
 #include "absl/strings/numbers.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
-
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/create_channel.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/credentials.h>
-#include <grpcpp/support/string_ref.h>
-
 #include "test/cpp/util/cli_call.h"
 #include "test/cpp/util/proto_file_parser.h"
 #include "test/cpp/util/proto_reflection_descriptor_database.h"
diff --git a/test/cpp/util/grpc_tool.h b/test/cpp/util/grpc_tool.h
index 471830f2fcb..defd8d04516 100644
--- a/test/cpp/util/grpc_tool.h
+++ b/test/cpp/util/grpc_tool.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CPP_UTIL_GRPC_TOOL_H
 #define GRPC_TEST_CPP_UTIL_GRPC_TOOL_H
 
-#include <functional>
-
 #include <grpcpp/support/config.h>
 
+#include <functional>
+
 #include "test/cpp/util/cli_credentials.h"
 
 namespace grpc {
diff --git a/test/cpp/util/grpc_tool_test.cc b/test/cpp/util/grpc_tool_test.cc
index 6d3b6d528da..294df983daf 100644
--- a/test/cpp/util/grpc_tool_test.cc
+++ b/test/cpp/util/grpc_tool_test.cc
@@ -18,16 +18,7 @@
 
 #include "test/cpp/util/grpc_tool.h"
 
-#include <chrono>
-#include <sstream>
-
 #include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
-#include "absl/flags/declare.h"
-#include "absl/flags/flag.h"
-#include "absl/strings/str_split.h"
-
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpcpp/channel.h>
@@ -37,7 +28,14 @@
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
+#include <gtest/gtest.h>
+
+#include <chrono>
+#include <sstream>
 
+#include "absl/flags/declare.h"
+#include "absl/flags/flag.h"
+#include "absl/strings/str_split.h"
 #include "src/core/util/env.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.pb.h"
diff --git a/test/cpp/util/metrics_server.cc b/test/cpp/util/metrics_server.cc
index 28dc7e670be..fd149fa76b6 100644
--- a/test/cpp/util/metrics_server.cc
+++ b/test/cpp/util/metrics_server.cc
@@ -18,11 +18,10 @@
 
 #include "test/cpp/util/metrics_server.h"
 
-#include "absl/log/log.h"
-
 #include <grpcpp/server.h>
 #include <grpcpp/server_builder.h>
 
+#include "absl/log/log.h"
 #include "src/core/util/crash.h"
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
diff --git a/test/cpp/util/metrics_server.h b/test/cpp/util/metrics_server.h
index 846b542db32..fae7bdf06b5 100644
--- a/test/cpp/util/metrics_server.h
+++ b/test/cpp/util/metrics_server.h
@@ -18,11 +18,11 @@
 #ifndef GRPC_TEST_CPP_UTIL_METRICS_SERVER_H
 #define GRPC_TEST_CPP_UTIL_METRICS_SERVER_H
 
+#include <grpcpp/server.h>
+
 #include <map>
 #include <mutex>
 
-#include <grpcpp/server.h>
-
 #include "src/proto/grpc/testing/metrics.grpc.pb.h"
 #include "src/proto/grpc/testing/metrics.pb.h"
 
diff --git a/test/cpp/util/proto_buffer_reader_test.cc b/test/cpp/util/proto_buffer_reader_test.cc
index 46137658f97..b4ffbff3e5a 100644
--- a/test/cpp/util/proto_buffer_reader_test.cc
+++ b/test/cpp/util/proto_buffer_reader_test.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/proto_buffer_reader.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/proto_buffer_writer_test.cc b/test/cpp/util/proto_buffer_writer_test.cc
index 77057b5fc33..3de8f6fde0e 100644
--- a/test/cpp/util/proto_buffer_writer_test.cc
+++ b/test/cpp/util/proto_buffer_writer_test.cc
@@ -14,10 +14,9 @@
 // limitations under the License.
 //
 
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/byte_buffer.h>
 #include <grpcpp/support/proto_buffer_writer.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/proto_file_parser.cc b/test/cpp/util/proto_file_parser.cc
index 5e570c57372..0613fd53751 100644
--- a/test/cpp/util/proto_file_parser.cc
+++ b/test/cpp/util/proto_file_parser.cc
@@ -18,6 +18,8 @@
 
 #include "test/cpp/util/proto_file_parser.h"
 
+#include <grpcpp/support/config.h>
+
 #include <algorithm>
 #include <iostream>
 #include <sstream>
@@ -26,8 +28,6 @@
 #include "absl/memory/memory.h"
 #include "absl/strings/str_split.h"
 
-#include <grpcpp/support/config.h>
-
 namespace grpc {
 namespace testing {
 namespace {
diff --git a/test/cpp/util/proto_file_parser.h b/test/cpp/util/proto_file_parser.h
index a397aa43eeb..84b43717ac8 100644
--- a/test/cpp/util/proto_file_parser.h
+++ b/test/cpp/util/proto_file_parser.h
@@ -19,10 +19,10 @@
 #ifndef GRPC_TEST_CPP_UTIL_PROTO_FILE_PARSER_H
 #define GRPC_TEST_CPP_UTIL_PROTO_FILE_PARSER_H
 
-#include <memory>
-
 #include <grpcpp/channel.h>
 
+#include <memory>
+
 #include "test/cpp/util/config_grpc_cli.h"
 #include "test/cpp/util/proto_reflection_descriptor_database.h"
 
diff --git a/test/cpp/util/proto_reflection_descriptor_database.cc b/test/cpp/util/proto_reflection_descriptor_database.cc
index ac0113fd509..6025a502c42 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.cc
+++ b/test/cpp/util/proto_reflection_descriptor_database.cc
@@ -21,7 +21,6 @@
 #include <vector>
 
 #include "absl/log/log.h"
-
 #include "src/core/util/crash.h"
 
 using grpc::reflection::v1alpha::ErrorResponse;
diff --git a/test/cpp/util/proto_reflection_descriptor_database.h b/test/cpp/util/proto_reflection_descriptor_database.h
index 2489860be66..a8a9b497246 100644
--- a/test/cpp/util/proto_reflection_descriptor_database.h
+++ b/test/cpp/util/proto_reflection_descriptor_database.h
@@ -18,14 +18,14 @@
 #ifndef GRPC_TEST_CPP_UTIL_PROTO_REFLECTION_DESCRIPTOR_DATABASE_H
 #define GRPC_TEST_CPP_UTIL_PROTO_REFLECTION_DESCRIPTOR_DATABASE_H
 
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
+
 #include <mutex>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
-
 #include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h"
 
 namespace grpc {
diff --git a/test/cpp/util/slice_test.cc b/test/cpp/util/slice_test.cc
index e8d2f3b04e2..1689f2f1cd7 100644
--- a/test/cpp/util/slice_test.cc
+++ b/test/cpp/util/slice_test.cc
@@ -16,12 +16,11 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc++/support/slice.h>
 #include <grpc/grpc.h>
 #include <grpc/slice.h>
 #include <grpcpp/impl/grpc_library.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/string_ref_test.cc b/test/cpp/util/string_ref_test.cc
index 6af0e73c632..eddaef5abad 100644
--- a/test/cpp/util/string_ref_test.cc
+++ b/test/cpp/util/string_ref_test.cc
@@ -16,11 +16,9 @@
 //
 //
 
-#include <string.h>
-
-#include <gtest/gtest.h>
-
 #include <grpcpp/support/string_ref.h>
+#include <gtest/gtest.h>
+#include <string.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/test_config_cc.cc b/test/cpp/util/test_config_cc.cc
index cf32dbc0eae..c1eea1502ef 100644
--- a/test/cpp/util/test_config_cc.cc
+++ b/test/cpp/util/test_config_cc.cc
@@ -19,7 +19,6 @@
 #include <vector>
 
 #include "absl/flags/parse.h"
-
 #include "test/cpp/util/test_config.h"
 
 namespace grpc {
diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc
index b4d3e116cd3..748d1398a96 100644
--- a/test/cpp/util/test_credentials_provider.cc
+++ b/test/cpp/util/test_credentials_provider.cc
@@ -19,6 +19,9 @@
 
 #include "test/cpp/util/test_credentials_provider.h"
 
+#include <grpc/support/sync.h>
+#include <grpcpp/security/server_credentials.h>
+
 #include <cstdio>
 #include <fstream>
 #include <iostream>
@@ -28,10 +31,6 @@
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
 #include "absl/log/log.h"
-
-#include <grpc/support/sync.h>
-#include <grpcpp/security/server_credentials.h>
-
 #include "src/core/util/crash.h"
 #include "test/core/end2end/data/ssl_test_data.h"
 
diff --git a/test/cpp/util/test_credentials_provider.h b/test/cpp/util/test_credentials_provider.h
index 40f90703237..91fbad33918 100644
--- a/test/cpp/util/test_credentials_provider.h
+++ b/test/cpp/util/test_credentials_provider.h
@@ -19,12 +19,12 @@
 #ifndef GRPC_TEST_CPP_UTIL_TEST_CREDENTIALS_PROVIDER_H
 #define GRPC_TEST_CPP_UTIL_TEST_CREDENTIALS_PROVIDER_H
 
-#include <memory>
-
 #include <grpcpp/security/credentials.h>
 #include <grpcpp/security/server_credentials.h>
 #include <grpcpp/support/channel_arguments.h>
 
+#include <memory>
+
 namespace grpc {
 namespace testing {
 
diff --git a/test/cpp/util/time_test.cc b/test/cpp/util/time_test.cc
index 11b141cc70f..01038486f53 100644
--- a/test/cpp/util/time_test.cc
+++ b/test/cpp/util/time_test.cc
@@ -16,10 +16,9 @@
 //
 //
 
-#include <gtest/gtest.h>
-
 #include <grpc/support/time.h>
 #include <grpcpp/support/time.h>
+#include <gtest/gtest.h>
 
 #include "test/core/test_util/test_config.h"
 
diff --git a/test/cpp/util/tls_test_utils.h b/test/cpp/util/tls_test_utils.h
index 9b4e69bcd80..52b9cf1e25c 100644
--- a/test/cpp/util/tls_test_utils.h
+++ b/test/cpp/util/tls_test_utils.h
@@ -17,12 +17,12 @@
 #ifndef GRPC_TEST_CPP_UTIL_TLS_TEST_UTILS_H
 #define GRPC_TEST_CPP_UTIL_TLS_TEST_UTILS_H
 
-#include <deque>
-
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpcpp/security/server_credentials.h>
 
+#include <deque>
+
 #include "src/core/util/thd.h"
 
 namespace grpc {
diff --git a/test/cpp/util/windows/manifest_file.cc b/test/cpp/util/windows/manifest_file.cc
index 85ac3d7eb37..d983f74bcc3 100644
--- a/test/cpp/util/windows/manifest_file.cc
+++ b/test/cpp/util/windows/manifest_file.cc
@@ -28,7 +28,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/str_split.h"
-
 #include "src/core/util/crash.h"
 
 namespace grpc {
diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc
index 866b1e2866b..6ccdafaae29 100644
--- a/tools/distrib/python/grpcio_tools/grpc_tools/main.cc
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/main.cc
@@ -14,13 +14,6 @@
 
 #include "grpc_tools/main.h"
 
-#include <algorithm>
-#include <map>
-#include <string>
-#include <tuple>
-#include <unordered_set>
-#include <vector>
-
 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/compiler/command_line_interface.h>
 #include <google/protobuf/compiler/importer.h>
@@ -29,8 +22,14 @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 
-#include "absl/strings/string_view.h"
+#include <algorithm>
+#include <map>
+#include <string>
+#include <tuple>
+#include <unordered_set>
+#include <vector>
 
+#include "absl/strings/string_view.h"
 #include "src/compiler/python_generator.h"
 
 using ::google::protobuf::FileDescriptor;

From 64b7fce68c4e450f07b3b78c8774f1d724984e55 Mon Sep 17 00:00:00 2001
From: Alisha Nanda <alishananda@google.com>
Date: Mon, 7 Oct 2024 10:16:48 -0700
Subject: [PATCH 37/74] Add new function to EventEngineSupportsFdExtension
 query extension that takes in a configured and bound but unconnected fd,
 connects to the given remote peer, and returns a resulting
 EventEngine::Endpoint.

PiperOrigin-RevId: 683229732
---
 .../lib/event_engine/extensions/supports_fd.h | 17 +++++++
 .../event_engine/posix_engine/posix_engine.cc | 51 ++++++++++++-------
 .../event_engine/posix_engine/posix_engine.h  | 15 +++---
 3 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/src/core/lib/event_engine/extensions/supports_fd.h b/src/core/lib/event_engine/extensions/supports_fd.h
index c7a1bfdcd4f..070bce175de 100644
--- a/src/core/lib/event_engine/extensions/supports_fd.h
+++ b/src/core/lib/event_engine/extensions/supports_fd.h
@@ -119,6 +119,23 @@ class EventEngineSupportsFdExtension {
   virtual std::unique_ptr<EventEngine::Endpoint> CreateEndpointFromFd(
       int fd, const EndpointConfig& config) = 0;
 
+  /// Creates an EventEngine::Endpoint from a file descriptor that is configured
+  /// and bound locally but not yet connected to a remote peer. Returns a
+  /// connection handle to cancel the connection attempt if needed. Created
+  /// endpoint will be returned through `on_connect` callback.
+  /// \a fd - The socket file descriptor.
+  /// \a on_connect - The callback to invoke once fd is connected to peer.
+  /// \a addr - The remote peer to connect to. This should be the mapped peer
+  /// address returned when creating a new socket.
+  /// \a config - Additional configuration to be applied to the endpoint.
+  /// \a memory_allocator - The endpoint may use the provided memory allocator
+  /// to track memory allocations.
+  /// \a timeout - The timeout to use for the connection attempt.
+  virtual EventEngine::ConnectionHandle CreateEndpointFromUnconnectedFd(
+      int fd, EventEngine::OnConnectCallback on_connect,
+      const EventEngine::ResolvedAddress& addr, const EndpointConfig& config,
+      MemoryAllocator memory_allocator, EventEngine::Duration timeout) = 0;
+
   /// Called when the posix listener has accepted a new client connection.
   /// \a listener_fd - The listening socket fd that accepted the new client
   /// connection.
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc
index f2275975b0d..1c7f6df10b1 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc
@@ -238,14 +238,16 @@ void AsyncConnect::OnWritable(absl::Status status)
   }
 }
 
-EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal(
-    PosixSocketWrapper sock, OnConnectCallback on_connect, ResolvedAddress addr,
-    MemoryAllocator&& allocator, const PosixTcpOptions& options,
-    Duration timeout) {
+EventEngine::ConnectionHandle
+PosixEventEngine::CreateEndpointFromUnconnectedFdInternal(
+    int fd, EventEngine::OnConnectCallback on_connect,
+    const EventEngine::ResolvedAddress& addr,
+    const PosixTcpOptions& tcp_options, MemoryAllocator memory_allocator,
+    EventEngine::Duration timeout) {
   int err;
   int connect_errno;
   do {
-    err = connect(sock.Fd(), addr.address(), addr.size());
+    err = connect(fd, addr.address(), addr.size());
   } while (err < 0 && errno == EINTR);
   connect_errno = (err < 0) ? errno : 0;
 
@@ -261,16 +263,15 @@ EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal(
   std::string name = absl::StrCat("tcp-client:", addr_uri.value());
   PosixEventPoller* poller = poller_manager_->Poller();
   EventHandle* handle =
-      poller->CreateHandle(sock.Fd(), name, poller->CanTrackErrors());
+      poller->CreateHandle(fd, name, poller->CanTrackErrors());
 
   if (connect_errno == 0) {
-    // Connection already succeded. Return 0 to discourage any cancellation
+    // Connection already succeeded. Return 0 to discourage any cancellation
     // attempts.
     Run([on_connect = std::move(on_connect),
-         ep = CreatePosixEndpoint(handle, nullptr, shared_from_this(),
-                                  std::move(allocator), options)]() mutable {
-      on_connect(std::move(ep));
-    });
+         ep = CreatePosixEndpoint(
+             handle, nullptr, shared_from_this(), std::move(memory_allocator),
+             tcp_options)]() mutable { on_connect(std::move(ep)); });
     return EventEngine::ConnectionHandle::kInvalid;
   }
   if (connect_errno != EWOULDBLOCK && connect_errno != EINPROGRESS) {
@@ -288,9 +289,10 @@ EventEngine::ConnectionHandle PosixEventEngine::ConnectInternal(
   // Connection is still in progress.
   int64_t connection_id =
       last_connection_id_.fetch_add(1, std::memory_order_acq_rel);
-  AsyncConnect* ac = new AsyncConnect(
-      std::move(on_connect), shared_from_this(), executor_.get(), handle,
-      std::move(allocator), options, addr_uri.value(), connection_id);
+  AsyncConnect* ac =
+      new AsyncConnect(std::move(on_connect), shared_from_this(),
+                       executor_.get(), handle, std::move(memory_allocator),
+                       tcp_options, addr_uri.value(), connection_id);
   int shard_number = connection_id % connection_shards_.size();
   struct ConnectionShard* shard = &connection_shards_[shard_number];
   {
@@ -635,14 +637,29 @@ EventEngine::ConnectionHandle PosixEventEngine::Connect(
          status = socket.status()]() mutable { on_connect(status); });
     return EventEngine::ConnectionHandle::kInvalid;
   }
-  return ConnectInternal((*socket).sock, std::move(on_connect),
-                         (*socket).mapped_target_addr,
-                         std::move(memory_allocator), options, timeout);
+  return CreateEndpointFromUnconnectedFdInternal(
+      (*socket).sock.Fd(), std::move(on_connect), (*socket).mapped_target_addr,
+      options, std::move(memory_allocator), timeout);
 #else   // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
   grpc_core::Crash("EventEngine::Connect is not supported on this platform");
 #endif  // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
 }
 
+EventEngine::ConnectionHandle PosixEventEngine::CreateEndpointFromUnconnectedFd(
+    int fd, EventEngine::OnConnectCallback on_connect,
+    const EventEngine::ResolvedAddress& addr, const EndpointConfig& config,
+    MemoryAllocator memory_allocator, EventEngine::Duration timeout) {
+#if GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
+  return CreateEndpointFromUnconnectedFdInternal(
+      fd, std::move(on_connect), addr, TcpOptionsFromEndpointConfig(config),
+      std::move(memory_allocator), timeout);
+#else   // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
+  grpc_core::Crash(
+      "EventEngine::CreateEndpointFromUnconnectedFd is not supported on this "
+      "platform");
+#endif  // GRPC_PLATFORM_SUPPORTS_POSIX_POLLING
+}
+
 std::unique_ptr<EventEngine::Endpoint>
 PosixEventEngine::CreatePosixEndpointFromFd(int fd,
                                             const EndpointConfig& config,
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.h b/src/core/lib/event_engine/posix_engine/posix_engine.h
index 82be0bdd0e5..63a142a11f2 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.h
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.h
@@ -174,6 +174,11 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
   std::unique_ptr<EventEngine::Endpoint> CreateEndpointFromFd(
       int fd, const EndpointConfig& config) override;
 
+  ConnectionHandle CreateEndpointFromUnconnectedFd(
+      int fd, EventEngine::OnConnectCallback on_connect,
+      const EventEngine::ResolvedAddress& addr, const EndpointConfig& config,
+      MemoryAllocator memory_allocator, EventEngine::Duration timeout) override;
+
   absl::StatusOr<std::unique_ptr<Listener>> CreateListener(
       Listener::AcceptCallback on_accept,
       absl::AnyInvocable<void(absl::Status)> on_shutdown,
@@ -235,12 +240,10 @@ class PosixEventEngine final : public PosixEventEngineWithFdSupport,
   static void PollerWorkInternal(
       std::shared_ptr<PosixEnginePollerManager> poller_manager);
 
-  ConnectionHandle ConnectInternal(
-      grpc_event_engine::experimental::PosixSocketWrapper sock,
-      OnConnectCallback on_connect, ResolvedAddress addr,
-      MemoryAllocator&& allocator,
-      const grpc_event_engine::experimental::PosixTcpOptions& options,
-      Duration timeout);
+  ConnectionHandle CreateEndpointFromUnconnectedFdInternal(
+      int fd, EventEngine::OnConnectCallback on_connect,
+      const EventEngine::ResolvedAddress& addr, const PosixTcpOptions& options,
+      MemoryAllocator memory_allocator, EventEngine::Duration timeout);
 
   void OnConnectFinishInternal(int connection_handle);
 

From e6ad69e1dd7de6336e9521fad0259bc5be2ee8f2 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 7 Oct 2024 11:18:58 -0700
Subject: [PATCH 38/74] Remove `work_serializer_clears_time_cache` experiment
 (#37851)

This was put in as a temporary kludge to carry us until `work_serializer_dispatch` was ready, however since #37637 this is a no-op for all known use cases (and I think it's time for `work_serializer_dispatch` to stick).

Closes #37851

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37851 from ctiller:tc 8ae59415bda496143240b76be1a126436ecec397
PiperOrigin-RevId: 683255110
---
 bazel/experiments.bzl                     |  1 -
 src/core/lib/experiments/experiments.cc   | 24 -----------------------
 src/core/lib/experiments/experiments.h    | 11 -----------
 src/core/lib/experiments/experiments.yaml |  6 ------
 src/core/util/work_serializer.cc          |  3 ---
 5 files changed, 45 deletions(-)

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 830d4a076d2..5ea1cd99f37 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -38,7 +38,6 @@ EXPERIMENT_ENABLES = {
     "time_caching_in_party": "time_caching_in_party",
     "trace_record_callops": "trace_record_callops",
     "unconstrained_max_quota_buffer_size": "unconstrained_max_quota_buffer_size",
-    "work_serializer_clears_time_cache": "work_serializer_clears_time_cache",
     "work_serializer_dispatch": "work_serializer_dispatch",
 }
 
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index 8464f0756a0..8c9675e0dd2 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -94,10 +94,6 @@ const char* const description_unconstrained_max_quota_buffer_size =
     "Discard the cap on the max free pool size for one memory allocator";
 const char* const additional_constraints_unconstrained_max_quota_buffer_size =
     "{}";
-const char* const description_work_serializer_clears_time_cache =
-    "Have the work serializer clear the time cache when it dispatches work.";
-const char* const additional_constraints_work_serializer_clears_time_cache =
-    "{}";
 const char* const description_work_serializer_dispatch =
     "Have the work serializer dispatch work to event engine for every "
     "callback, instead of running things inline in the first thread that "
@@ -159,10 +155,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_unconstrained_max_quota_buffer_size,
      additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0,
      false, true},
-    {"work_serializer_clears_time_cache",
-     description_work_serializer_clears_time_cache,
-     additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
-     true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
      additional_constraints_work_serializer_dispatch, nullptr, 0, false, true},
 };
@@ -243,10 +235,6 @@ const char* const description_unconstrained_max_quota_buffer_size =
     "Discard the cap on the max free pool size for one memory allocator";
 const char* const additional_constraints_unconstrained_max_quota_buffer_size =
     "{}";
-const char* const description_work_serializer_clears_time_cache =
-    "Have the work serializer clear the time cache when it dispatches work.";
-const char* const additional_constraints_work_serializer_clears_time_cache =
-    "{}";
 const char* const description_work_serializer_dispatch =
     "Have the work serializer dispatch work to event engine for every "
     "callback, instead of running things inline in the first thread that "
@@ -308,10 +296,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_unconstrained_max_quota_buffer_size,
      additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0,
      false, true},
-    {"work_serializer_clears_time_cache",
-     description_work_serializer_clears_time_cache,
-     additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
-     true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
      additional_constraints_work_serializer_dispatch, nullptr, 0, false, true},
 };
@@ -392,10 +376,6 @@ const char* const description_unconstrained_max_quota_buffer_size =
     "Discard the cap on the max free pool size for one memory allocator";
 const char* const additional_constraints_unconstrained_max_quota_buffer_size =
     "{}";
-const char* const description_work_serializer_clears_time_cache =
-    "Have the work serializer clear the time cache when it dispatches work.";
-const char* const additional_constraints_work_serializer_clears_time_cache =
-    "{}";
 const char* const description_work_serializer_dispatch =
     "Have the work serializer dispatch work to event engine for every "
     "callback, instead of running things inline in the first thread that "
@@ -457,10 +437,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_unconstrained_max_quota_buffer_size,
      additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0,
      false, true},
-    {"work_serializer_clears_time_cache",
-     description_work_serializer_clears_time_cache,
-     additional_constraints_work_serializer_clears_time_cache, nullptr, 0, true,
-     true},
     {"work_serializer_dispatch", description_work_serializer_dispatch,
      additional_constraints_work_serializer_dispatch, nullptr, 0, true, true},
 };
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index 8aa59e12f9b..afc86b9ce51 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -84,8 +84,6 @@ inline bool IsTimeCachingInPartyEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
 inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
-inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
 inline bool IsWorkSerializerDispatchEnabled() { return false; }
 
 #elif defined(GPR_WINDOWS)
@@ -119,8 +117,6 @@ inline bool IsTimeCachingInPartyEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
 inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
-inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
 inline bool IsWorkSerializerDispatchEnabled() { return false; }
 
 #else
@@ -153,8 +149,6 @@ inline bool IsTimeCachingInPartyEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_TRACE_RECORD_CALLOPS
 inline bool IsTraceRecordCallopsEnabled() { return true; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
-inline bool IsWorkSerializerClearsTimeCacheEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
 inline bool IsWorkSerializerDispatchEnabled() { return true; }
 #endif
@@ -182,7 +176,6 @@ enum ExperimentIds {
   kExperimentIdTimeCachingInParty,
   kExperimentIdTraceRecordCallops,
   kExperimentIdUnconstrainedMaxQuotaBufferSize,
-  kExperimentIdWorkSerializerClearsTimeCache,
   kExperimentIdWorkSerializerDispatch,
   kNumExperiments
 };
@@ -270,10 +263,6 @@ inline bool IsTraceRecordCallopsEnabled() {
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() {
   return IsExperimentEnabled<kExperimentIdUnconstrainedMaxQuotaBufferSize>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_CLEARS_TIME_CACHE
-inline bool IsWorkSerializerClearsTimeCacheEnabled() {
-  return IsExperimentEnabled<kExperimentIdWorkSerializerClearsTimeCache>();
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_WORK_SERIALIZER_DISPATCH
 inline bool IsWorkSerializerDispatchEnabled() {
   return IsExperimentEnabled<kExperimentIdWorkSerializerDispatch>();
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index ff4bf3869d4..a8f2105f7a5 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -165,12 +165,6 @@
   expiry: 2024/09/09
   owner: ctiller@google.com
   test_tags: [resource_quota_test]
-- name: work_serializer_clears_time_cache
-  description:
-    Have the work serializer clear the time cache when it dispatches work.
-  expiry: 2024/10/01
-  owner: ctiller@google.com
-  test_tags: []
 - name: work_serializer_dispatch
   description:
     Have the work serializer dispatch work to event engine for every callback,
diff --git a/src/core/util/work_serializer.cc b/src/core/util/work_serializer.cc
index c9e0b1d9f45..38ee82303a2 100644
--- a/src/core/util/work_serializer.cc
+++ b/src/core/util/work_serializer.cc
@@ -243,9 +243,6 @@ void WorkSerializer::LegacyWorkSerializer::DrainQueueOwned() {
     }
     // There is at least one callback on the queue. Pop the callback from the
     // queue and execute it.
-    if (IsWorkSerializerClearsTimeCacheEnabled() && ExecCtx::Get() != nullptr) {
-      ExecCtx::Get()->InvalidateNow();
-    }
     CallbackWrapper* cb_wrapper = nullptr;
     bool empty_unused;
     while ((cb_wrapper = reinterpret_cast<CallbackWrapper*>(

From 204dc57345bb25325c11a5539d1448a0a08cb91f Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 7 Oct 2024 15:35:29 -0700
Subject: [PATCH 39/74] [experiments] Push out the expiry of some WIP
 experiments (#37850)

Closes #37850

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37850 from ctiller:fmt aa31cf9d7d8156ab61fbec2e0ca2272af1415e81
PiperOrigin-RevId: 683349868
---
 src/core/lib/experiments/experiments.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index a8f2105f7a5..7362efde841 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -109,7 +109,7 @@
 - name: multiping
   description:
     Allow more than one ping to be in flight at a time by default.
-  expiry: 2024/09/15
+  expiry: 2025/03/03
   owner: ctiller@google.com
   test_tags: [flow_control_test]
 - name: pick_first_new
@@ -120,7 +120,7 @@
 - name: promise_based_inproc_transport
   description:
     Use promises for the in-process transport.
-  expiry: 2024/09/15
+  expiry: 2025/03/03
   owner: ctiller@google.com
   test_tags: []
   allow_in_fuzzing_config: false # experiment currently crashes if enabled
@@ -162,7 +162,7 @@
   test_tags: []
 - name: unconstrained_max_quota_buffer_size
   description: Discard the cap on the max free pool size for one memory allocator
-  expiry: 2024/09/09
+  expiry: 2025/03/03
   owner: ctiller@google.com
   test_tags: [resource_quota_test]
 - name: work_serializer_dispatch

From 2e0eea1e643900f5e79bbbdb6044ee411a5924f2 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 8 Oct 2024 08:21:31 -0700
Subject: [PATCH 40/74] [tests] restrict visibility of our internal test-only
 copy of the xDS protos

We really should not have our own copy of these protos in the first
place, but there's some tech debt here that hasn't been cleaned up yet.
Until we do that, we should at least ensure that this tech debt doesn't
spread by having more code depend on them.

PiperOrigin-RevId: 683631165
---
 bazel/grpc_build_system.bzl         | 2 +-
 src/proto/grpc/testing/xds/v3/BUILD | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index 50bd830ef21..a90113e2f29 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -725,7 +725,7 @@ def grpc_package(name, visibility = "private", features = []):
         features: The features to enable.
     """
     if visibility == "tests":
-        visibility = ["//test:__subpackages__"]
+        visibility = ["//test:__subpackages__", "//src/proto/grpc/testing:__subpackages__"]
     elif visibility == "public":
         visibility = ["//visibility:public"]
     elif visibility == "private":
diff --git a/src/proto/grpc/testing/xds/v3/BUILD b/src/proto/grpc/testing/xds/v3/BUILD
index 15b8e0796c0..cc04d3d20fa 100644
--- a/src/proto/grpc/testing/xds/v3/BUILD
+++ b/src/proto/grpc/testing/xds/v3/BUILD
@@ -23,7 +23,7 @@ exports_files([
 
 grpc_package(
     name = "xds_v3",
-    visibility = "public",
+    visibility = "tests",
 )
 
 grpc_proto_library(
@@ -331,6 +331,8 @@ grpc_proto_library(
     srcs = [
         "csds.proto",
     ],
+    # Needs to be visible to //:grpcpp_csds
+    visibility = ["//:__subpackages__"],
     well_known_protos = True,
     deps = [
         "base_proto",

From d56d89f6911e2e85c04d119dbeae44a52831321e Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 8 Oct 2024 09:09:59 -0700
Subject: [PATCH 41/74] [EventEngine] Remove invalid IOCP closed socket test
 (#37864)

The [CreateIoCompletionPort ](https://learn.microsoft.com/en-us/windows/win32/fileio/createiocompletionport) API specifies that the handle must either be open, or explicitly the `INVALID_HANDLE_VALUE` value. Testing the API with a closed socket is apparently UB.

Closes #37864

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37864 from drfloob:rm-iocp-ub-test 514e89989988456b94ddee1a3f2582c1f9885bf0
PiperOrigin-RevId: 683647143
---
 test/core/event_engine/windows/iocp_test.cc | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/test/core/event_engine/windows/iocp_test.cc b/test/core/event_engine/windows/iocp_test.cc
index 9e798ff7e21..2eaaccdc494 100644
--- a/test/core/event_engine/windows/iocp_test.cc
+++ b/test/core/event_engine/windows/iocp_test.cc
@@ -250,16 +250,6 @@ TEST_F(IOCPTest, KickThenShutdownCasusesNextWorkerToBeKicked) {
   thread_pool->Quiesce();
 }
 
-TEST_F(IOCPTest, CrashOnWatchingAClosedSocket) {
-  auto thread_pool = grpc_event_engine::experimental::MakeThreadPool(8);
-  IOCP iocp(thread_pool.get());
-  SOCKET sockpair[2];
-  CreateSockpair(sockpair, iocp.GetDefaultSocketFlags());
-  closesocket(sockpair[0]);
-  ASSERT_DEATH({ auto wrapped_client_socket = iocp.Watch(sockpair[0]); }, "");
-  thread_pool->Quiesce();
-}
-
 TEST_F(IOCPTest, StressTestThousandsOfSockets) {
   // Start 10 threads, each with their own IOCP
   // On each thread, create 50 socket pairs (100 sockets) and have them exchange

From 49d63f686aa983c33e04723bbd0095ce8aec1b94 Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 8 Oct 2024 11:07:55 -0700
Subject: [PATCH 42/74] Delete Binder test artifacts and examples (#37862)

With the CL-first approach, the docker test configs for Binder need to be deleted before the Binder code and tests themselves can be deleted in the next step. Sanity checks fail otherwise.

Closes #37862

PiperOrigin-RevId: 683691175
---
 .../binder/java/io/grpc/binder/cpp/README.md  | 24 -----
 .../cpp/exampleclient/AndroidManifest.xml     | 25 ------
 .../io/grpc/binder/cpp/exampleclient/BUILD    | 51 -----------
 .../cpp/exampleclient/ButtonPressHandler.java | 15 ----
 .../cpp/exampleclient/MainActivity.java       | 26 ------
 .../grpc/binder/cpp/exampleclient/native.cc   | 72 ---------------
 .../res/layout/activity_main.xml              | 24 -----
 .../cpp/exampleclient/res/values/strings.xml  |  5 --
 .../cpp/exampleserver/AndroidManifest.xml     | 21 -----
 .../AndroidManifest_endpoint.xml              | 10 ---
 .../io/grpc/binder/cpp/exampleserver/BUILD    | 61 -------------
 .../cpp/exampleserver/ButtonPressHandler.java | 13 ---
 .../ExportedEndpointService.java              | 26 ------
 .../cpp/exampleserver/MainActivity.java       | 27 ------
 .../grpc/binder/cpp/exampleserver/native.cc   | 82 -----------------
 .../res/layout/activity_main.xml              | 24 -----
 .../cpp/exampleserver/res/values/strings.xml  |  5 --
 .../binder_transport_apk/Dockerfile.template  | 49 -----------
 .../bazel/test_single_bazel_version.sh        |  3 -
 .../dockerimage_current_versions.bzl          |  1 -
 tools/bazelify_tests/test/strict_tests.bzl    |  2 +-
 .../clang_format_all_the_things.sh            |  2 +-
 .../test/binder_transport_apk.current_version |  1 -
 .../test/binder_transport_apk/Dockerfile      | 87 -------------------
 .../linux/grpc_bazel_build_in_docker.sh       |  2 -
 .../linux/grpc_binder_transport_apk.cfg       | 30 -------
 .../linux/grpc_binder_transport_apk.sh        | 27 ------
 27 files changed, 2 insertions(+), 713 deletions(-)
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/README.md
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/values/strings.xml
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest.xml
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest_endpoint.xml
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ButtonPressHandler.java
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ExportedEndpointService.java
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/MainActivity.java
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/layout/activity_main.xml
 delete mode 100644 examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/values/strings.xml
 delete mode 100644 templates/tools/dockerfile/test/binder_transport_apk/Dockerfile.template
 delete mode 100644 tools/dockerfile/test/binder_transport_apk.current_version
 delete mode 100644 tools/dockerfile/test/binder_transport_apk/Dockerfile
 delete mode 100644 tools/internal_ci/linux/grpc_binder_transport_apk.cfg
 delete mode 100755 tools/internal_ci/linux/grpc_binder_transport_apk.sh

diff --git a/examples/android/binder/java/io/grpc/binder/cpp/README.md b/examples/android/binder/java/io/grpc/binder/cpp/README.md
deleted file mode 100644
index 8a9ba6ec26f..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# gRPC-core BinderTransport example apps
-
-## Build Instruction
-
-1. Install Android SDK and NDK. Only NDK version >= 25 is supported. We tested against SDK Platform `33` and NDK `26.2.11394342`.
-2. Make sure Bazel is at least `7.0`. Use `export OVERRIDE_BAZEL_VERSION=7.3.1` to selected a supported version listed in `bazel/supported_versions.txt` if necessary.
-3. Point environment variables to install locations of SDK and NDK
-    ```
-    export ANDROID_HOME=$HOME/android-sdk
-    export ANDROID_NDK_HOME=$HOME/android-sdk/ndk/26.2.11394342
-    ```
-4. To build a fat APK that supports `x86_64`, `armv7`, and `arm64`:
-    ```
-    bazel build \
-      --extra_toolchains=@androidndk//:all \
-      --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \
-      --copt=-Wno-unknown-warning-option \
-      //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app \
-      //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app
-    ```
-5. `adb install
-   bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/app.apk`
-6. `adb install
-   bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/app.apk`
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml
deleted file mode 100644
index 8dea1553faf..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.grpc.binder.cpp.exampleclient"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-  <uses-sdk
-      android:minSdkVersion="29"
-      android:targetSdkVersion="30" />
-
-   <queries>
-      <package android:name="io.grpc.binder.cpp.exampleserver" />
-   </queries>
-
-  <application
-      android:label="gRPC BinderTransport Client Cpp">
-    <activity
-        android:name=".MainActivity"
-        android:label="gRPC BinderTransport Client Cpp" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
-</manifest>
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD
deleted file mode 100644
index 8b11ebb383a..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-cc_library(
-    name = "jni_lib",
-    srcs = ["native.cc"],
-    linkopts = [
-        "-ldl",
-        "-llog",
-        "-lm",
-        "-Wl,--no-undefined",
-    ],
-    deps = [
-        "//:grpc++",
-        "//examples/protos:helloworld_cc_grpc",
-    ],
-    alwayslink = True,
-)
-
-android_library(
-    name = "activity",
-    srcs = [
-        "ButtonPressHandler.java",
-        "MainActivity.java",
-    ],
-    manifest = "AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-    deps = [
-        ":jni_lib",
-        "@binder_transport_android_helper//io/grpc/binder/cpp:connection_helper",
-    ],
-)
-
-android_binary(
-    name = "app",
-    manifest = "AndroidManifest.xml",
-    deps = [
-        ":activity",
-    ],
-)
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java
deleted file mode 100644
index ed9d11a404b..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.grpc.binder.cpp.exampleclient;
-
-import android.app.Application;
-
-public class ButtonPressHandler {
-  static {
-    System.loadLibrary("app");
-  }
-
-  public native String native_entry(Application application);
-
-  public String onPressed(Application application) {
-    return native_entry(application);
-  }
-}
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java
deleted file mode 100644
index 3cbf70d1e65..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.grpc.binder.cpp.exampleclient;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.TextView;
-
-/** Main class for the example app. */
-public class MainActivity extends Activity {
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    Log.v("Example", "hello, world");
-
-    setContentView(R.layout.activity_main);
-
-    Button clickMeButton = findViewById(R.id.clickMeButton);
-    TextView exampleTextView = findViewById(R.id.exampleTextView);
-
-    ButtonPressHandler h = new ButtonPressHandler();
-
-    clickMeButton.setOnClickListener(
-        v -> exampleTextView.setText(h.onPressed(getApplication())));
-  }
-}
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
deleted file mode 100644
index 3cb8637eb69..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <android/log.h>
-#include <grpcpp/create_channel_binder.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <jni.h>
-
-#include "examples/protos/helloworld.grpc.pb.h"
-#include "examples/protos/helloworld.pb.h"
-
-extern "C" JNIEXPORT jstring JNICALL
-Java_io_grpc_binder_cpp_exampleclient_ButtonPressHandler_native_1entry(
-    JNIEnv* env, jobject /*this*/, jobject application) {
-  // Lower the gRPC logging level, here it is just for demo and debugging
-  // purpose.
-  setenv("GRPC_VERBOSITY", "INFO", true);
-  if (grpc::experimental::InitializeBinderChannelJavaClass(env)) {
-    __android_log_print(ANDROID_LOG_INFO, "DemoClient",
-                        "InitializeBinderChannelJavaClass succeed");
-  } else {
-    __android_log_print(ANDROID_LOG_INFO, "DemoClient",
-                        "InitializeBinderChannelJavaClass failed");
-  }
-  static bool first = true;
-  static std::shared_ptr<grpc::Channel> channel;
-  if (first) {
-    first = false;
-    JavaVM* jvm;
-    {
-      jint result = env->GetJavaVM(&jvm);
-      assert(result == 0);
-    }
-    grpc::ChannelArguments ch_args;
-    // This is not required since "grpc.io.action.BIND" is already the default.
-    ch_args.SetString("grpc.binder.custom_android_intent_action_name",
-                      "grpc.io.action.BIND");
-    channel = grpc::experimental::CreateCustomBinderChannel(
-        env, application, "io.grpc.binder.cpp.exampleserver",
-        "io.grpc.binder.cpp.exampleserver.ExportedEndpointService",
-        std::make_shared<
-            grpc::experimental::binder::SameSignatureSecurityPolicy>(
-            jvm, application),
-        ch_args);
-    return env->NewStringUTF("Clicked 1 time, channel created");
-  } else {
-    auto stub = helloworld::Greeter::NewStub(channel);
-    grpc::ClientContext context;
-    helloworld::HelloRequest request;
-    helloworld::HelloReply response;
-    request.set_name("BinderTransportClient");
-    grpc::Status status = stub->SayHello(&context, request, &response);
-    if (status.ok()) {
-      return env->NewStringUTF(response.message().c_str());
-    }
-    return env->NewStringUTF(
-        std::string("Clicked more than 1 time. Status not ok " +
-                    std::to_string(status.error_code()))
-            .c_str());
-  }
-}
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml
deleted file mode 100644
index e866d8df894..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:padding="16dp"
-    android:orientation="vertical"
-    android:gravity="center_vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-  <TextView
-      android:id="@+id/exampleTextView"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_horizontal"
-      android:textSize="32dp"
-      android:text="@string/thinking_face"/>
-
-  <Button
-      android:id="@+id/clickMeButton"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_horizontal"
-      android:layout_marginTop="16dp"
-      android:text="@string/click_me_button"/>
-</LinearLayout>
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/values/strings.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/values/strings.xml
deleted file mode 100644
index 7593624fa84..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="click_me_button">Run example</string>
-  <string name="thinking_face">🤔</string>
-</resources>
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest.xml
deleted file mode 100644
index fe2cd2e7d95..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.grpc.binder.cpp.exampleserver"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-  <uses-sdk
-      android:minSdkVersion="29"
-      android:targetSdkVersion="30" />
-
-  <application
-      android:label="gRPC BinderTransport Server Cpp">
-    <activity
-        android:name=".MainActivity"
-        android:label="gRPC BinderTransport Server Cpp" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
-</manifest>
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest_endpoint.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest_endpoint.xml
deleted file mode 100644
index a9c9d5c4f68..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/AndroidManifest_endpoint.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.grpc.binder.cpp.exampleserver">
-  <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="30"/>
-  <application>
-    <service
-        android:name=".ExportedEndpointService"
-        android:exported="true"/>
-  </application>
-</manifest>
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
deleted file mode 100644
index b4e88ebc90a..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/BUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-cc_library(
-    name = "jni_lib",
-    srcs = ["native.cc"],
-    linkopts = [
-        "-ldl",
-        "-llog",
-        "-lm",
-        "-Wl,--no-undefined",
-    ],
-    deps = [
-        "//:grpc++",
-        "//examples/protos:helloworld_cc_grpc",
-    ],
-    alwayslink = True,
-)
-
-android_library(
-    name = "activity",
-    srcs = [
-        "ButtonPressHandler.java",
-        "MainActivity.java",
-    ],
-    manifest = "AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-    deps = [
-        ":endpoint",
-        ":jni_lib",
-    ],
-)
-
-android_library(
-    name = "endpoint",
-    srcs = ["ExportedEndpointService.java"],
-    exports_manifest = True,
-    manifest = "AndroidManifest_endpoint.xml",
-    deps = [
-        "@binder_transport_android_helper//io/grpc/binder/cpp:connection_helper",
-    ],
-)
-
-android_binary(
-    name = "app",
-    manifest = "AndroidManifest.xml",
-    deps = [
-        ":activity",
-    ],
-)
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ButtonPressHandler.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ButtonPressHandler.java
deleted file mode 100644
index 34d38ccf58a..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ButtonPressHandler.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.grpc.binder.cpp.exampleserver;
-
-import android.app.Application;
-
-public class ButtonPressHandler {
-  static {
-    System.loadLibrary("app");
-  }
-
-  public String onPressed(Application application) {
-    return "Server Button Pressed";
-  }
-}
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ExportedEndpointService.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ExportedEndpointService.java
deleted file mode 100644
index 0ca908e78fd..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/ExportedEndpointService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.grpc.binder.cpp.exampleserver;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-import android.content.Context;
-import io.grpc.binder.cpp.GrpcCppServerBuilder;
-
-/** Exposes gRPC services running in the main process */
-public final class ExportedEndpointService extends Service {
-  static {
-    System.loadLibrary("app");
-  }
-
-  public ExportedEndpointService() {
-    init_grpc_server(this);
-  }
-
-  @Override
-  public IBinder onBind(Intent intent) {
-    // The argument should match the URI passed into grpc::ServerBuilder::AddListeningPort
-    return GrpcCppServerBuilder.GetEndpointBinder("binder:example.service");
-  }
-
-  public native void init_grpc_server(Context context);
-}
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/MainActivity.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/MainActivity.java
deleted file mode 100644
index d252e5f2bd3..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/MainActivity.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package io.grpc.binder.cpp.exampleserver;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.Button;
-import android.widget.TextView;
-import io.grpc.binder.cpp.exampleserver.R;
-
-/** Main class for the example app. */
-public class MainActivity extends Activity {
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    Log.v("Example", "hello, world");
-
-    setContentView(R.layout.activity_main);
-
-    Button clickMeButton = findViewById(R.id.clickMeButton);
-    TextView exampleTextView = findViewById(R.id.exampleTextView);
-
-    ButtonPressHandler h = new ButtonPressHandler();
-
-    clickMeButton.setOnClickListener(
-        v -> exampleTextView.setText(h.onPressed(getApplication())));
-  }
-}
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
deleted file mode 100644
index 0f220c1066c..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/native.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <android/log.h>
-#include <grpcpp/create_channel_binder.h>
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/binder_credentials.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <jni.h>
-
-#include "examples/protos/helloworld.grpc.pb.h"
-#include "examples/protos/helloworld.pb.h"
-
-namespace {
-class GreeterService : public helloworld::Greeter::Service {
- public:
-  grpc::Status SayHello(grpc::ServerContext*,
-                        const helloworld::HelloRequest* request,
-                        helloworld::HelloReply* response) override {
-    __android_log_print(ANDROID_LOG_INFO, "DemoServer", "Line number %d",
-                        __LINE__);
-    __android_log_print(ANDROID_LOG_INFO, "DemoServer", "Got hello request: %s",
-                        request->name().c_str());
-    response->set_message("Hi, " + request->name());
-    return grpc::Status::OK;
-  }
-};
-
-}  // namespace
-
-extern "C" JNIEXPORT void JNICALL
-Java_io_grpc_binder_cpp_exampleserver_ExportedEndpointService_init_1grpc_1server(
-    JNIEnv* env, jobject /*this*/, jobject context) {
-  // Lower the gRPC logging level, here it is just for demo and debugging
-  // purpose.
-  setenv("GRPC_VERBOSITY", "INFO", true);
-  __android_log_print(ANDROID_LOG_INFO, "DemoServer", "Line number %d",
-                      __LINE__);
-  static std::unique_ptr<grpc::Server> server = nullptr;
-
-  if (server != nullptr) {
-    // Already initiated
-    return;
-  }
-
-  if (grpc::experimental::InitializeBinderChannelJavaClass(env)) {
-    __android_log_print(ANDROID_LOG_INFO, "DemoServer",
-                        "InitializeBinderChannelJavaClass succeed");
-  } else {
-    __android_log_print(ANDROID_LOG_INFO, "DemoServer",
-                        "InitializeBinderChannelJavaClass failed");
-  }
-
-  static GreeterService service;
-  grpc::ServerBuilder server_builder;
-  server_builder.RegisterService(&service);
-
-  JavaVM* jvm;
-  {
-    jint result = env->GetJavaVM(&jvm);
-    assert(result == 0);
-  }
-  server_builder.AddListeningPort(
-      "binder:example.service",
-      grpc::experimental::BinderServerCredentials(
-          std::make_shared<
-              grpc::experimental::binder::SameSignatureSecurityPolicy>(
-              jvm, context)));
-
-  server = server_builder.BuildAndStart();
-}
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/layout/activity_main.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/layout/activity_main.xml
deleted file mode 100644
index e866d8df894..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/layout/activity_main.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:padding="16dp"
-    android:orientation="vertical"
-    android:gravity="center_vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-  <TextView
-      android:id="@+id/exampleTextView"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_horizontal"
-      android:textSize="32dp"
-      android:text="@string/thinking_face"/>
-
-  <Button
-      android:id="@+id/clickMeButton"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_horizontal"
-      android:layout_marginTop="16dp"
-      android:text="@string/click_me_button"/>
-</LinearLayout>
diff --git a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/values/strings.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/values/strings.xml
deleted file mode 100644
index 7593624fa84..00000000000
--- a/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="click_me_button">Run example</string>
-  <string name="thinking_face">🤔</string>
-</resources>
diff --git a/templates/tools/dockerfile/test/binder_transport_apk/Dockerfile.template b/templates/tools/dockerfile/test/binder_transport_apk/Dockerfile.template
deleted file mode 100644
index 5601967cd7c..00000000000
--- a/templates/tools/dockerfile/test/binder_transport_apk/Dockerfile.template
+++ /dev/null
@@ -1,49 +0,0 @@
-%YAML 1.2
---- |
-  # Copyright 2021 The gRPC Authors
-  #
-  # Licensed under the Apache License, Version 2.0 (the "License");
-  # you may not use this file except in compliance with the License.
-  # You may obtain a copy of the License at
-  #
-  #     http://www.apache.org/licenses/LICENSE-2.0
-  #
-  # Unless required by applicable law or agreed to in writing, software
-  # distributed under the License is distributed on an "AS IS" BASIS,
-  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  # See the License for the specific language governing permissions and
-  # limitations under the License.
-  
-  <%include file="../../oss_fuzz_base.include"/>
-  <%include file="../../bazel.include"/>
-
-  #========================
-  # Java
-  RUN apt-get install -y openjdk-21-jdk
-
-  #========================
-  # Android SDK/NDK installation
-  ENV ANDROID_SDK_VERSION 11076708
-  ENV ANDROID_NDK_VERSION 26.2.11394342
-
-  ENV SDK_ROOT /opt/android-sdk
-
-  RUN mkdir -p $SDK_ROOT
-  RUN cd $SDK_ROOT && \
-      wget -O cmd.zip https://dl.google.com/android/repository/commandlinetools-linux-${'${ANDROID_SDK_VERSION}'}_latest.zip && \
-      unzip -q cmd.zip && \
-      rm cmd.zip
-
-  RUN yes | $SDK_ROOT/cmdline-tools/bin/sdkmanager --sdk_root=$SDK_ROOT --licenses  # accept all licenses
-
-  # This is not required but desirable to reduce the time to download and the chance of download failure.
-  RUN mkdir -p ~/.android && touch ~/.android/repositories.cfg
-
-  RUN $SDK_ROOT/cmdline-tools/bin/sdkmanager --sdk_root=$SDK_ROOT "ndk;$ANDROID_NDK_VERSION" "platforms;android-33" "build-tools;34.0.0"
-
-  # Set environment variables for Bazel rules
-  ENV ANDROID_HOME $SDK_ROOT
-  ENV ANDROID_NDK_HOME $SDK_ROOT/ndk/$ANDROID_NDK_VERSION
-  
-  # Define the default command.
-  CMD ["bash"]
diff --git a/test/distrib/bazel/test_single_bazel_version.sh b/test/distrib/bazel/test_single_bazel_version.sh
index 24682d3568c..48feef0d6b1 100755
--- a/test/distrib/bazel/test_single_bazel_version.sh
+++ b/test/distrib/bazel/test_single_bazel_version.sh
@@ -66,9 +66,6 @@ EXCLUDED_TARGETS=(
   "-//third_party/toolchains/rbe_windows_bazel_6.3.2_vs2019/..."
   "-//third_party/toolchains:rbe_windows_default_toolchain_suite"
 
-  # TODO(jtattermusch): add back once fixed
-  "-//examples/android/binder/..."
-
   # Exclude bazelified tests as they contain some bazel hackery
   "-//tools/bazelify_tests/..."
 )
diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl
index 541d9a7b9dc..f60d37e5d5b 100644
--- a/tools/bazelify_tests/dockerimage_current_versions.bzl
+++ b/tools/bazelify_tests/dockerimage_current_versions.bzl
@@ -90,7 +90,6 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
     "tools/dockerfile/test/android_ndk.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/android_ndk@sha256:e4fd2e0048c4ffd2a04e4a41154ee469ed61e058cb704ee95071f7a3bdad507a",
     "tools/dockerfile/test/bazel.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/bazel@sha256:be25af8c0e5faf39a585e7ddd657c4fd66513e4eba0ee0c687109b19ed462518",
     "tools/dockerfile/test/bazel_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64@sha256:ce026fedc059c74bade52f4b87c54907a3cf9abb22f6a584dba584e1925bbc42",
-    "tools/dockerfile/test/binder_transport_apk.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk@sha256:5dddb0d70ee427c7ee20d2b4f9261579218dd6b208b74c2913e0e3c79b3166f7",
     "tools/dockerfile/test/csharp_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_arm64@sha256:4d4bc5f15e03f3d3d8fd889670ecde2c66a2e4d2dd9db80733c05c1d90c8a248",
     "tools/dockerfile/test/csharp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64@sha256:0763d919b17b4cfe5b65aff3bf911c04e9e4d46d11649858742033facd9f534f",
     "tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:10587bea5d163bf5c34c6157ebd1863d22863d9d38bbaf5135ffc6fbf2b73004",
diff --git a/tools/bazelify_tests/test/strict_tests.bzl b/tools/bazelify_tests/test/strict_tests.bzl
index 90d39ee65fb..086d591313b 100644
--- a/tools/bazelify_tests/test/strict_tests.bzl
+++ b/tools/bazelify_tests/test/strict_tests.bzl
@@ -31,7 +31,7 @@ def generate_strict_tests(name = ""):
     strict_warning_jobs = []
 
     for source in [
-        ":all //src/core/... //src/compiler/... //examples/... -//examples/android/binder/...",
+        ":all //src/core/... //src/compiler/... //examples/...",
         "//test/... -//test/core/... -//test/cpp/...",
         "//test/core/end2end/...",
         "//test/core/... -//test/core/end2end/...",
diff --git a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
index ffd486b5f6a..4541cfd27ff 100755
--- a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
+++ b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
@@ -16,7 +16,7 @@
 set -e
 
 # directories to run against
-DIRS="examples/cpp examples/android/binder src/core src/cpp test/core test/cpp include src/compiler src/ruby src/objective-c tools/distrib/python src/python/grpcio_observability"
+DIRS="examples/cpp src/core src/cpp test/core test/cpp include src/compiler src/ruby src/objective-c tools/distrib/python src/python/grpcio_observability"
 
 # file matching patterns to check
 GLOB="*.h *.c *.cc *.m *.mm"
diff --git a/tools/dockerfile/test/binder_transport_apk.current_version b/tools/dockerfile/test/binder_transport_apk.current_version
deleted file mode 100644
index ebb3af308e6..00000000000
--- a/tools/dockerfile/test/binder_transport_apk.current_version
+++ /dev/null
@@ -1 +0,0 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/binder_transport_apk:bbd5ccb5bcc5e63beccba6b3b2e8c907a8335731@sha256:5dddb0d70ee427c7ee20d2b4f9261579218dd6b208b74c2913e0e3c79b3166f7
\ No newline at end of file
diff --git a/tools/dockerfile/test/binder_transport_apk/Dockerfile b/tools/dockerfile/test/binder_transport_apk/Dockerfile
deleted file mode 100644
index 24d50cee474..00000000000
--- a/tools/dockerfile/test/binder_transport_apk/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2021 The gRPC Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Pinned version of the base image is used to avoid regressions caused
-# by rebuilding of this docker image. To see available versions, you can run
-# "gcloud container images list-tags gcr.io/oss-fuzz-base/base-builder"
-# This base image is built on Mar 12, 2024
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:c3581153788bc49f3634fec3cd36a5d6dfd26632c4afc157fb6faf8ce3af732e
-
-# -------------------------- WARNING --------------------------------------
-# If you are making changes to this file, consider changing
-# https://github.com/google/oss-fuzz/blob/master/projects/grpc/Dockerfile
-# accordingly.
-# -------------------------------------------------------------------------
-
-# Install basic packages
-RUN apt-get update && apt-get -y install \
-  autoconf \
-  build-essential \
-  curl \
-  libtool \
-  make \
-  vim \
-  wget
-
-#========================
-# Bazel installation
-
-# Must be in sync with tools/bazel
-ENV BAZEL_VERSION 7.3.1
-
-# The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper.
-ENV DISABLE_BAZEL_WRAPPER 1
-
-# Download the correct bazel version and make sure it's on path.
-RUN BAZEL_ARCH_SUFFIX="$(uname -m | sed s/aarch64/arm64/)" \
-  && curl -sSL --fail -o /usr/local/bin/bazel "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-linux-$BAZEL_ARCH_SUFFIX" \
-  && chmod a+x /usr/local/bin/bazel
-
-# Normally we would run "bazel --version" here to make sure bazel
-# was correctly installed, but we can't do that because
-# of # https://github.com/bazelbuild/bazel/issues/11379.
-# We want to keep the arm64 version of the image buildable
-# on x64 with use of qemu-user-static & binfmt emulation,
-# but the self-extraction is broken for bazel currently.
-# The binary will work correctly when run on real arm64
-# hardware, when qemu-user-static isn't getting into the way.
-
-
-#========================
-# Java
-RUN apt-get install -y openjdk-21-jdk
-
-#========================
-# Android SDK/NDK installation
-ENV ANDROID_SDK_VERSION 11076708
-ENV ANDROID_NDK_VERSION 26.2.11394342
-
-ENV SDK_ROOT /opt/android-sdk
-
-RUN mkdir -p $SDK_ROOT
-RUN cd $SDK_ROOT &&     wget -O cmd.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip &&     unzip -q cmd.zip &&     rm cmd.zip
-
-RUN yes | $SDK_ROOT/cmdline-tools/bin/sdkmanager --sdk_root=$SDK_ROOT --licenses  # accept all licenses
-
-# This is not required but desirable to reduce the time to download and the chance of download failure.
-RUN mkdir -p ~/.android && touch ~/.android/repositories.cfg
-
-RUN $SDK_ROOT/cmdline-tools/bin/sdkmanager --sdk_root=$SDK_ROOT "ndk;$ANDROID_NDK_VERSION" "platforms;android-33" "build-tools;34.0.0"
-
-# Set environment variables for Bazel rules
-ENV ANDROID_HOME $SDK_ROOT
-ENV ANDROID_NDK_HOME $SDK_ROOT/ndk/$ANDROID_NDK_VERSION
-
-# Define the default command.
-CMD ["bash"]
diff --git a/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh
index 8bc71cd4643..5ddc5a006ab 100755
--- a/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh
+++ b/tools/internal_ci/linux/grpc_bazel_build_in_docker.sh
@@ -15,8 +15,6 @@
 
 # Build all basic targets using the strict warning option which leverages the
 # clang compiler to check if sources can pass a set of warning options.
-# For now //examples/android/binder/ are excluded because it needs Android
-# SDK/NDK to be installed to build
 
 set -ex
 
diff --git a/tools/internal_ci/linux/grpc_binder_transport_apk.cfg b/tools/internal_ci/linux/grpc_binder_transport_apk.cfg
deleted file mode 100644
index 0021005e88f..00000000000
--- a/tools/internal_ci/linux/grpc_binder_transport_apk.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Config file for the internal CI (in protobuf text format)
-
-# Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_binder_transport_apk.sh"
-timeout_mins: 60
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.*"
-    regex: "github/grpc/reports/**"
-  }
-}
-
-env_vars {
-  key: "BAZEL_SCRIPT"
-  value: "tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh"
-}
diff --git a/tools/internal_ci/linux/grpc_binder_transport_apk.sh b/tools/internal_ci/linux/grpc_binder_transport_apk.sh
deleted file mode 100755
index 1a27fa24883..00000000000
--- a/tools/internal_ci/linux/grpc_binder_transport_apk.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-# avoid slow finalization after the script has exited.
-source $(dirname $0)/../../../tools/internal_ci/helper_scripts/move_src_tree_and_respawn_itself_rc
-
-# change to grpc repo root
-cd $(dirname $0)/../../..
-
-source tools/internal_ci/helper_scripts/prepare_build_linux_rc
-
-export DOCKERFILE_DIR=tools/dockerfile/test/binder_transport_apk
-exec tools/run_tests/dockerize/build_and_run_docker.sh "${BAZEL_SCRIPT}"

From 4abd199841751c7d956287d88660d10228272c2b Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 8 Oct 2024 13:31:33 -0700
Subject: [PATCH 43/74] Delete gRPC C++ Binder implementation

PiperOrigin-RevId: 683745729
---
 BUILD                                         | 133 ---
 CMakeLists.txt                                | 866 ------------------
 Makefile                                      |   1 -
 Package.swift                                 |   1 -
 WORKSPACE                                     |  10 -
 build_autogenerated.yaml                      | 765 ----------------
 config.m4                                     |   2 -
 config.w32                                    |   2 -
 gRPC-C++.podspec                              |  61 --
 gRPC-Core.podspec                             |   1 -
 grpc.gemspec                                  |   1 -
 include/grpc/support/port_platform.h          |   1 -
 .../grpcpp/security/binder_security_policy.h  |  82 --
 package.xml                                   |   1 -
 src/core/BUILD                                |  32 +-
 src/core/ext/transport/binder/README.md       |  10 -
 .../binder/client/channel_create_impl.h       |  42 -
 .../binder/client/connection_id_generator.cc  |  69 --
 src/core/ext/transport/binder/java/WORKSPACE  |   0
 .../binder/java/io/grpc/binder/cpp/BUILD      |  30 -
 .../grpc/binder/cpp/GrpcBinderConnection.java | 104 ---
 .../grpc/binder/cpp/GrpcCppServerBuilder.java |  40 -
 .../binder/cpp/NativeConnectionHelper.java    |  71 --
 .../binder/security_policy/security_policy.h  |  40 -
 .../binder/transport/binder_stream.h          | 117 ---
 .../binder/utils/binder_auto_utils.h          |  76 --
 .../ext/transport/binder/utils/ndk_binder.h   | 107 ---
 .../binder/wire_format/binder_constants.cc    |  29 -
 .../binder/wire_format/transaction.cc         |  33 -
 .../plugin_registry/grpc_plugin_registry.cc   |   6 -
 src/core/resolver/binder/README.md            |   9 -
 src/python/grpcio/grpc_core_dependencies.py   |   1 -
 test/core/resolver/BUILD                      |  16 -
 test/core/transport/binder/BUILD              | 133 ---
 test/core/transport/binder/end2end/BUILD      | 119 ---
 .../transport/binder/end2end/fuzzers/BUILD    | 101 --
 .../empty                                     |   0
 .../fuzzers/binder_transport_fuzzer.proto     |  81 --
 .../empty                                     |   0
 .../binder/end2end/fuzzers/client.proto       |  17 -
 .../binder/end2end/fuzzers/fuzzer_utils.cc    | 157 ----
 .../binder/end2end/fuzzers/server.proto       |  17 -
 test/core/transport/binder/mock_objects.cc    |  55 --
 test/core/transport/binder/mock_objects.h     | 121 ---
 tools/doxygen/Doxyfile.c++                    |   3 -
 tools/doxygen/Doxyfile.c++.internal           |  42 -
 tools/doxygen/Doxyfile.core.internal          |   3 -
 ...pc_binder_transport_apk_build_in_docker.sh |  40 -
 tools/run_tests/generated/tests.json          | 192 ----
 49 files changed, 1 insertion(+), 3839 deletions(-)
 delete mode 100644 include/grpcpp/security/binder_security_policy.h
 delete mode 100644 src/core/ext/transport/binder/README.md
 delete mode 100644 src/core/ext/transport/binder/client/channel_create_impl.h
 delete mode 100644 src/core/ext/transport/binder/client/connection_id_generator.cc
 delete mode 100644 src/core/ext/transport/binder/java/WORKSPACE
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
 delete mode 100644 src/core/ext/transport/binder/security_policy/security_policy.h
 delete mode 100644 src/core/ext/transport/binder/transport/binder_stream.h
 delete mode 100644 src/core/ext/transport/binder/utils/binder_auto_utils.h
 delete mode 100644 src/core/ext/transport/binder/utils/ndk_binder.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/binder_constants.cc
 delete mode 100644 src/core/ext/transport/binder/wire_format/transaction.cc
 delete mode 100644 src/core/resolver/binder/README.md
 delete mode 100644 test/core/transport/binder/BUILD
 delete mode 100644 test/core/transport/binder/end2end/BUILD
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/BUILD
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/client.proto
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/server.proto
 delete mode 100644 test/core/transport/binder/mock_objects.cc
 delete mode 100644 test/core/transport/binder/mock_objects.h
 delete mode 100755 tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh

diff --git a/BUILD b/BUILD
index 4d57a053c1f..b737fb5ecdb 100644
--- a/BUILD
+++ b/BUILD
@@ -74,17 +74,6 @@ config_setting(
     flag_values = {":disable_grpc_rls": "true"},
 )
 
-# When gRPC is build as shared library, binder transport code might still
-# get included even when user's code does not depend on it. In that case
-# --define=grpc_no_binder=true can be used to disable binder transport
-# related code to reduce binary size.
-# For users using build system other than bazel, they can define
-# GRPC_NO_BINDER to achieve the same effect.
-config_setting(
-    name = "grpc_no_binder_define",
-    values = {"define": "grpc_no_binder=true"},
-)
-
 config_setting(
     name = "android",
     values = {"crosstool_top": "//external:android/crosstool"},
@@ -135,15 +124,6 @@ selects.config_setting_group(
     ],
 )
 
-selects.config_setting_group(
-    name = "grpc_no_binder",
-    match_any = [
-        ":grpc_no_binder_define",
-        # We do not need binder on ios.
-        ":ios",
-    ],
-)
-
 selects.config_setting_group(
     name = "grpc_no_rls",
     match_any = [
@@ -855,7 +835,6 @@ grpc_cc_library(
         "//src/core:grpc_lb_policy_weighted_target",
         "//src/core:grpc_channel_idle_filter",
         "//src/core:grpc_message_size_filter",
-        "//src/core:grpc_resolver_binder",
         "grpc_resolver_dns_ares",
         "grpc_resolver_fake",
         "//src/core:grpc_resolver_dns_native",
@@ -941,12 +920,6 @@ grpc_cc_library(
                 "grpc++_xds_server",
             ],
         },
-        {
-            "grpc_no_binder": [],
-            "//conditions:default": [
-                "grpc++_binder",
-            ],
-        },
     ],
     tags = ["nofixdeps"],
     visibility = ["@grpc:public"],
@@ -1077,112 +1050,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "grpc++_binder",
-    srcs = [
-        "//src/core:ext/transport/binder/client/binder_connector.cc",
-        "//src/core:ext/transport/binder/client/channel_create.cc",
-        "//src/core:ext/transport/binder/client/channel_create_impl.cc",
-        "//src/core:ext/transport/binder/client/connection_id_generator.cc",
-        "//src/core:ext/transport/binder/client/endpoint_binder_pool.cc",
-        "//src/core:ext/transport/binder/client/jni_utils.cc",
-        "//src/core:ext/transport/binder/client/security_policy_setting.cc",
-        "//src/core:ext/transport/binder/security_policy/binder_security_policy.cc",
-        "//src/core:ext/transport/binder/server/binder_server.cc",
-        "//src/core:ext/transport/binder/server/binder_server_credentials.cc",
-        "//src/core:ext/transport/binder/transport/binder_transport.cc",
-        "//src/core:ext/transport/binder/utils/ndk_binder.cc",
-        "//src/core:ext/transport/binder/utils/transport_stream_receiver_impl.cc",
-        "//src/core:ext/transport/binder/wire_format/binder_android.cc",
-        "//src/core:ext/transport/binder/wire_format/binder_constants.cc",
-        "//src/core:ext/transport/binder/wire_format/transaction.cc",
-        "//src/core:ext/transport/binder/wire_format/wire_reader_impl.cc",
-        "//src/core:ext/transport/binder/wire_format/wire_writer.cc",
-    ],
-    hdrs = [
-        "//src/core:ext/transport/binder/client/binder_connector.h",
-        "//src/core:ext/transport/binder/client/channel_create_impl.h",
-        "//src/core:ext/transport/binder/client/connection_id_generator.h",
-        "//src/core:ext/transport/binder/client/endpoint_binder_pool.h",
-        "//src/core:ext/transport/binder/client/jni_utils.h",
-        "//src/core:ext/transport/binder/client/security_policy_setting.h",
-        "//src/core:ext/transport/binder/server/binder_server.h",
-        "//src/core:ext/transport/binder/transport/binder_stream.h",
-        "//src/core:ext/transport/binder/transport/binder_transport.h",
-        "//src/core:ext/transport/binder/utils/binder_auto_utils.h",
-        "//src/core:ext/transport/binder/utils/ndk_binder.h",
-        "//src/core:ext/transport/binder/utils/transport_stream_receiver.h",
-        "//src/core:ext/transport/binder/utils/transport_stream_receiver_impl.h",
-        "//src/core:ext/transport/binder/wire_format/binder.h",
-        "//src/core:ext/transport/binder/wire_format/binder_android.h",
-        "//src/core:ext/transport/binder/wire_format/binder_constants.h",
-        "//src/core:ext/transport/binder/wire_format/transaction.h",
-        "//src/core:ext/transport/binder/wire_format/wire_reader.h",
-        "//src/core:ext/transport/binder/wire_format/wire_reader_impl.h",
-        "//src/core:ext/transport/binder/wire_format/wire_writer.h",
-    ],
-    defines = select({
-        "grpc_no_binder": ["GRPC_NO_BINDER"],
-        "//conditions:default": [],
-    }),
-    external_deps = [
-        "absl/base:core_headers",
-        "absl/cleanup",
-        "absl/container:flat_hash_map",
-        "absl/functional:any_invocable",
-        "absl/hash",
-        "absl/log:check",
-        "absl/log:log",
-        "absl/memory",
-        "absl/meta:type_traits",
-        "absl/status",
-        "absl/status:statusor",
-        "absl/strings",
-        "absl/synchronization",
-        "absl/time",
-        "absl/types:variant",
-    ],
-    language = "c++",
-    public_hdrs = [
-        "include/grpcpp/security/binder_security_policy.h",
-        "include/grpcpp/create_channel_binder.h",
-        "include/grpcpp/security/binder_credentials.h",
-    ],
-    tags = ["nofixdeps"],
-    deps = [
-        "channel",
-        "channel_create",
-        "config",
-        "debug_location",
-        "exec_ctx",
-        "gpr",
-        "gpr_platform",
-        "grpc",
-        "grpc++_base",
-        "grpc_base",
-        "grpc_client_channel",
-        "grpc_public_hdrs",
-        "orphanable",
-        "ref_counted_ptr",
-        "server",
-        "//src/core:arena",
-        "//src/core:channel_args",
-        "//src/core:channel_args_preconditioning",
-        "//src/core:channel_stack_type",
-        "//src/core:default_event_engine",
-        "//src/core:error_utils",
-        "//src/core:iomgr_fwd",
-        "//src/core:iomgr_port",
-        "//src/core:metadata_batch",
-        "//src/core:notification",
-        "//src/core:slice",
-        "//src/core:slice_refcount",
-        "//src/core:status_helper",
-        "//src/core:subchannel_connector",
-        "//src/core:transport_fwd",
-    ],
-)
-
 grpc_cc_library(
     name = "grpc++_xds_client",
     srcs = [
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41e69b70ab7..113eb420a38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -962,9 +962,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx bin_decoder_test)
   add_dependencies(buildtests_cxx bin_encoder_test)
   add_dependencies(buildtests_cxx binary_metadata_test)
-  add_dependencies(buildtests_cxx binder_resolver_test)
-  add_dependencies(buildtests_cxx binder_server_test)
-  add_dependencies(buildtests_cxx binder_transport_test)
   add_dependencies(buildtests_cxx bitset_test)
   add_dependencies(buildtests_cxx blackboard_test)
   add_dependencies(buildtests_cxx buffer_list_test)
@@ -1080,12 +1077,8 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx dump_args_test)
   add_dependencies(buildtests_cxx duplicate_header_bad_client_test)
   add_dependencies(buildtests_cxx empty_batch_test)
-  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
-    add_dependencies(buildtests_cxx end2end_binder_transport_test)
-  endif()
   add_dependencies(buildtests_cxx end2end_test)
   add_dependencies(buildtests_cxx endpoint_addresses_test)
-  add_dependencies(buildtests_cxx endpoint_binder_pool_test)
   add_dependencies(buildtests_cxx endpoint_config_test)
   add_dependencies(buildtests_cxx endpoint_pair_test)
   add_dependencies(buildtests_cxx env_test)
@@ -1105,7 +1098,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx experiments_tag_test)
   add_dependencies(buildtests_cxx experiments_test)
   add_dependencies(buildtests_cxx factory_test)
-  add_dependencies(buildtests_cxx fake_binder_test)
   add_dependencies(buildtests_cxx fake_resolver_test)
   add_dependencies(buildtests_cxx fake_transport_security_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
@@ -1537,7 +1529,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx trailing_metadata_test)
   add_dependencies(buildtests_cxx transport_security_common_api_test)
   add_dependencies(buildtests_cxx transport_security_test)
-  add_dependencies(buildtests_cxx transport_stream_receiver_test)
   add_dependencies(buildtests_cxx try_join_test)
   add_dependencies(buildtests_cxx try_seq_metadata_test)
   add_dependencies(buildtests_cxx try_seq_test)
@@ -1562,8 +1553,6 @@ if(gRPC_BUILD_TESTS)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS)
     add_dependencies(buildtests_cxx windows_endpoint_test)
   endif()
-  add_dependencies(buildtests_cxx wire_reader_test)
-  add_dependencies(buildtests_cxx wire_writer_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx work_serializer_test)
   endif()
@@ -2547,7 +2536,6 @@ add_library(grpc
   src/core/load_balancing/xds/xds_wrr_locality.cc
   src/core/plugin_registry/grpc_plugin_registry.cc
   src/core/plugin_registry/grpc_plugin_registry_extra.cc
-  src/core/resolver/binder/binder_resolver.cc
   src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3314,7 +3302,6 @@ add_library(grpc_unsecure
   src/core/load_balancing/weighted_target/weighted_target.cc
   src/core/plugin_registry/grpc_plugin_registry.cc
   src/core/plugin_registry/grpc_plugin_registry_noextra.cc
-  src/core/resolver/binder/binder_resolver.cc
   src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -4188,24 +4175,6 @@ endif()
 endif()
 
 add_library(grpc++
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
   src/cpp/client/call_credentials.cc
   src/cpp/client/channel_cc.cc
   src/cpp/client/channel_credentials.cc
@@ -4387,7 +4356,6 @@ foreach(_hdr
   include/grpcpp/client_context.h
   include/grpcpp/completion_queue.h
   include/grpcpp/create_channel.h
-  include/grpcpp/create_channel_binder.h
   include/grpcpp/create_channel_posix.h
   include/grpcpp/ext/call_metric_recorder.h
   include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -4479,8 +4447,6 @@ foreach(_hdr
   include/grpcpp/security/auth_context.h
   include/grpcpp/security/auth_metadata_processor.h
   include/grpcpp/security/authorization_policy_provider.h
-  include/grpcpp/security/binder_credentials.h
-  include/grpcpp/security/binder_security_policy.h
   include/grpcpp/security/credentials.h
   include/grpcpp/security/server_credentials.h
   include/grpcpp/security/tls_certificate_provider.h
@@ -8170,220 +8136,6 @@ target_link_libraries(binary_metadata_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(binder_resolver_test
-  test/core/resolver/binder_resolver_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(binder_resolver_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(binder_resolver_test PUBLIC cxx_std_14)
-target_include_directories(binder_resolver_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(binder_resolver_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  grpc_test_util
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(binder_server_test
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
-  test/core/transport/binder/end2end/binder_server_test.cc
-  test/core/transport/binder/end2end/fake_binder.cc
-  test/cpp/end2end/test_service_impl.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(binder_server_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-      "GRPCXX_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(binder_server_test PUBLIC cxx_std_14)
-target_include_directories(binder_server_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(binder_server_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  grpc++_test_util
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(binder_transport_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/binder_transport_test.cc
-  test/core/transport/binder/mock_objects.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(binder_transport_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(binder_transport_test PUBLIC cxx_std_14)
-target_include_directories(binder_transport_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(binder_transport_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -13300,70 +13052,6 @@ target_link_libraries(empty_batch_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
-
-  add_executable(end2end_binder_transport_test
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
-    test/core/transport/binder/end2end/end2end_binder_transport_test.cc
-    test/core/transport/binder/end2end/fake_binder.cc
-    test/core/transport/binder/end2end/testing_channel_create.cc
-    test/cpp/end2end/test_service_impl.cc
-  )
-  if(WIN32 AND MSVC)
-    if(BUILD_SHARED_LIBS)
-      target_compile_definitions(end2end_binder_transport_test
-      PRIVATE
-        "GPR_DLL_IMPORTS"
-        "GRPC_DLL_IMPORTS"
-        "GRPCXX_DLL_IMPORTS"
-      )
-    endif()
-  endif()
-  target_compile_features(end2end_binder_transport_test PUBLIC cxx_std_14)
-  target_include_directories(end2end_binder_transport_test
-    PRIVATE
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      ${CMAKE_CURRENT_SOURCE_DIR}/include
-      ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-      ${_gRPC_RE2_INCLUDE_DIR}
-      ${_gRPC_SSL_INCLUDE_DIR}
-      ${_gRPC_UPB_GENERATED_DIR}
-      ${_gRPC_UPB_GRPC_GENERATED_DIR}
-      ${_gRPC_UPB_INCLUDE_DIR}
-      ${_gRPC_XXHASH_INCLUDE_DIR}
-      ${_gRPC_ZLIB_INCLUDE_DIR}
-      third_party/googletest/googletest/include
-      third_party/googletest/googletest
-      third_party/googletest/googlemock/include
-      third_party/googletest/googlemock
-      ${_gRPC_PROTO_GENS_DIR}
-  )
-
-  target_link_libraries(end2end_binder_transport_test
-    ${_gRPC_ALLTARGETS_LIBRARIES}
-    gtest
-    grpc++_test_util
-  )
-
-
-endif()
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -13471,117 +13159,6 @@ target_link_libraries(endpoint_addresses_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(endpoint_binder_pool_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/endpoint_binder_pool_test.cc
-  test/core/transport/binder/mock_objects.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(endpoint_binder_pool_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(endpoint_binder_pool_test PUBLIC cxx_std_14)
-target_include_directories(endpoint_binder_pool_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(endpoint_binder_pool_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -14327,117 +13904,6 @@ target_link_libraries(factory_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(fake_binder_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/end2end/fake_binder.cc
-  test/core/transport/binder/end2end/fake_binder_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(fake_binder_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(fake_binder_test PUBLIC cxx_std_14)
-target_include_directories(fake_binder_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(fake_binder_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -32582,116 +32048,6 @@ target_link_libraries(transport_security_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(transport_stream_receiver_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/transport_stream_receiver_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(transport_stream_receiver_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(transport_stream_receiver_test PUBLIC cxx_std_14)
-target_include_directories(transport_stream_receiver_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(transport_stream_receiver_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -33469,228 +32825,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS)
 
 
 endif()
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(wire_reader_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/mock_objects.cc
-  test/core/transport/binder/wire_reader_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(wire_reader_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(wire_reader_test PUBLIC cxx_std_14)
-target_include_directories(wire_reader_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(wire_reader_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(wire_writer_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/mock_objects.cc
-  test/core/transport/binder/wire_writer_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(wire_writer_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(wire_writer_test PUBLIC cxx_std_14)
-target_include_directories(wire_writer_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(wire_writer_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
diff --git a/Makefile b/Makefile
index b33a29370b9..063659c0cfb 100644
--- a/Makefile
+++ b/Makefile
@@ -1355,7 +1355,6 @@ LIBGRPC_SRC = \
     src/core/load_balancing/xds/xds_wrr_locality.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-    src/core/resolver/binder/binder_resolver.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
diff --git a/Package.swift b/Package.swift
index f1e60c511ca..bfda2eef090 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1702,7 +1702,6 @@ let package = Package(
         "src/core/load_balancing/xds/xds_wrr_locality.cc",
         "src/core/plugin_registry/grpc_plugin_registry.cc",
         "src/core/plugin_registry/grpc_plugin_registry_extra.cc",
-        "src/core/resolver/binder/binder_resolver.cc",
         "src/core/resolver/dns/c_ares/dns_resolver_ares.cc",
         "src/core/resolver/dns/c_ares/dns_resolver_ares.h",
         "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h",
diff --git a/WORKSPACE b/WORKSPACE
index 675233b2eb1..f3188fcaeaf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -56,16 +56,6 @@ android_ndk_repository(name = "androidndk")
 # here, because the toolchain rule fails when $ANDROID_NDK_HOME is not set.
 # Use `--extra_toolchains=@androidndk//:all` to manually register it when building for Android.
 
-# Prevents bazel's '...' expansion from including the following folder.
-# This is required because the BUILD file in the following folder
-# will trigger bazel failure when Android SDK is not configured.
-# The targets in the following folder need to be included in APK and will
-# be invoked by binder transport implementation through JNI.
-local_repository(
-    name = "binder_transport_android_helper",
-    path = "src/core/ext/transport/binder/java",
-)
-
 # Prevents bazel's '...' expansion from including the following folder.
 # This is required to avoid triggering "Unable to find package for @rules_fuzzing//fuzzing:cc_defs.bzl"
 # error.
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 3ae9dd5577c..0df78d48a7a 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -1958,7 +1958,6 @@ libs:
   - src/core/load_balancing/xds/xds_wrr_locality.cc
   - src/core/plugin_registry/grpc_plugin_registry.cc
   - src/core/plugin_registry/grpc_plugin_registry_extra.cc
-  - src/core/resolver/binder/binder_resolver.cc
   - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3077,7 +3076,6 @@ libs:
   - src/core/load_balancing/weighted_target/weighted_target.cc
   - src/core/plugin_registry/grpc_plugin_registry.cc
   - src/core/plugin_registry/grpc_plugin_registry_noextra.cc
-  - src/core/resolver/binder/binder_resolver.cc
   - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3763,7 +3761,6 @@ libs:
   - include/grpcpp/client_context.h
   - include/grpcpp/completion_queue.h
   - include/grpcpp/create_channel.h
-  - include/grpcpp/create_channel_binder.h
   - include/grpcpp/create_channel_posix.h
   - include/grpcpp/ext/call_metric_recorder.h
   - include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -3855,8 +3852,6 @@ libs:
   - include/grpcpp/security/auth_context.h
   - include/grpcpp/security/auth_metadata_processor.h
   - include/grpcpp/security/authorization_policy_provider.h
-  - include/grpcpp/security/binder_credentials.h
-  - include/grpcpp/security/binder_security_policy.h
   - include/grpcpp/security/credentials.h
   - include/grpcpp/security/server_credentials.h
   - include/grpcpp/security/tls_certificate_provider.h
@@ -3895,26 +3890,6 @@ libs:
   - include/grpcpp/version_info.h
   - include/grpcpp/xds_server_builder.h
   headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
   - src/core/xds/grpc/xds_enabled_server.h
   - src/cpp/client/client_stats_interceptor.h
   - src/cpp/client/create_channel_internal.h
@@ -3928,24 +3903,6 @@ libs:
   - src/cpp/server/thread_pool_interface.h
   - src/cpp/thread_manager/thread_manager.h
   src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
   - src/cpp/client/call_credentials.cc
   - src/cpp/client/channel_cc.cc
   - src/cpp/client/channel_credentials.cc
@@ -6134,146 +6091,6 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
-- name: binder_resolver_test
-  gtest: true
-  build: test
-  language: c++
-  headers: []
-  src:
-  - test/core/resolver/binder_resolver_test.cc
-  deps:
-  - gtest
-  - grpc_test_util
-- name: binder_server_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - test/core/transport/binder/end2end/fake_binder.h
-  - test/cpp/end2end/test_service_impl.h
-  src:
-  - src/proto/grpc/testing/echo.proto
-  - src/proto/grpc/testing/echo_messages.proto
-  - src/proto/grpc/testing/simple_messages.proto
-  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
-  - test/core/transport/binder/end2end/binder_server_test.cc
-  - test/core/transport/binder/end2end/fake_binder.cc
-  - test/cpp/end2end/test_service_impl.cc
-  deps:
-  - gtest
-  - grpc++_test_util
-- name: binder_transport_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/binder_transport_test.cc
-  - test/core/transport/binder/mock_objects.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: bitset_test
   gtest: true
   build: test
@@ -9645,30 +9462,6 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
-- name: end2end_binder_transport_test
-  gtest: true
-  build: test
-  run: false
-  language: c++
-  headers:
-  - test/core/transport/binder/end2end/fake_binder.h
-  - test/core/transport/binder/end2end/testing_channel_create.h
-  - test/cpp/end2end/test_service_impl.h
-  src:
-  - src/proto/grpc/testing/echo.proto
-  - src/proto/grpc/testing/echo_messages.proto
-  - src/proto/grpc/testing/simple_messages.proto
-  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
-  - test/core/transport/binder/end2end/end2end_binder_transport_test.cc
-  - test/core/transport/binder/end2end/fake_binder.cc
-  - test/core/transport/binder/end2end/testing_channel_create.cc
-  - test/cpp/end2end/test_service_impl.cc
-  deps:
-  - gtest
-  - grpc++_test_util
-  platforms:
-  - linux
-  - posix
 - name: end2end_test
   gtest: true
   build: test
@@ -9700,118 +9493,6 @@ targets:
   - gtest
   - grpc_test_util
   uses_polling: false
-- name: endpoint_binder_pool_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/endpoint_binder_pool_test.cc
-  - test/core/transport/binder/mock_objects.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: endpoint_config_test
   gtest: true
   build: test
@@ -10176,118 +9857,6 @@ targets:
   deps:
   - gtest
   - grpc_test_util_unsecure
-- name: fake_binder_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/end2end/fake_binder.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/end2end/fake_binder.cc
-  - test/core/transport/binder/end2end/fake_binder_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: fake_resolver_test
   gtest: true
   build: test
@@ -20649,116 +20218,6 @@ targets:
   deps:
   - gtest
   - grpc_test_util
-- name: transport_stream_receiver_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/transport_stream_receiver_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: try_join_test
   gtest: true
   build: test
@@ -21068,230 +20527,6 @@ targets:
   - posix
   - windows
   uses_polling: false
-- name: wire_reader_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/mock_objects.cc
-  - test/core/transport/binder/wire_reader_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
-- name: wire_writer_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/mock_objects.cc
-  - test/core/transport/binder/wire_writer_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: work_serializer_test
   gtest: true
   build: test
diff --git a/config.m4 b/config.m4
index cd9212d3572..8a5692bac9a 100644
--- a/config.m4
+++ b/config.m4
@@ -730,7 +730,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/load_balancing/xds/xds_wrr_locality.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-    src/core/resolver/binder/binder_resolver.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
@@ -1601,7 +1600,6 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/xds)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/binder)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/c_ares)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/event_engine)
diff --git a/config.w32 b/config.w32
index b590018a1bd..088607cb0a0 100644
--- a/config.w32
+++ b/config.w32
@@ -695,7 +695,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\load_balancing\\xds\\xds_wrr_locality.cc " +
     "src\\core\\plugin_registry\\grpc_plugin_registry.cc " +
     "src\\core\\plugin_registry\\grpc_plugin_registry_extra.cc " +
-    "src\\core\\resolver\\binder\\binder_resolver.cc " +
     "src\\core\\resolver\\dns\\c_ares\\dns_resolver_ares.cc " +
     "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_posix.cc " +
     "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_windows.cc " +
@@ -1741,7 +1740,6 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\xds");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\plugin_registry");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\binder");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\c_ares");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\event_engine");
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index aeb929b9ad6..5f416533062 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -97,7 +97,6 @@ Pod::Spec.new do |s|
                       'include/grpcpp/client_context.h',
                       'include/grpcpp/completion_queue.h',
                       'include/grpcpp/create_channel.h',
-                      'include/grpcpp/create_channel_binder.h',
                       'include/grpcpp/create_channel_posix.h',
                       'include/grpcpp/ext/call_metric_recorder.h',
                       'include/grpcpp/ext/health_check_service_server_builder_option.h',
@@ -185,8 +184,6 @@ Pod::Spec.new do |s|
                       'include/grpcpp/security/auth_context.h',
                       'include/grpcpp/security/auth_metadata_processor.h',
                       'include/grpcpp/security/authorization_policy_provider.h',
-                      'include/grpcpp/security/binder_credentials.h',
-                      'include/grpcpp/security/binder_security_policy.h',
                       'include/grpcpp/security/credentials.h',
                       'include/grpcpp/security/server_credentials.h',
                       'include/grpcpp/security/tls_certificate_provider.h',
@@ -313,44 +310,6 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/rbac/rbac_service_config_parser.h',
                       'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                       'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
-                      'src/core/ext/transport/binder/client/binder_connector.cc',
-                      'src/core/ext/transport/binder/client/binder_connector.h',
-                      'src/core/ext/transport/binder/client/channel_create.cc',
-                      'src/core/ext/transport/binder/client/channel_create_impl.cc',
-                      'src/core/ext/transport/binder/client/channel_create_impl.h',
-                      'src/core/ext/transport/binder/client/connection_id_generator.cc',
-                      'src/core/ext/transport/binder/client/connection_id_generator.h',
-                      'src/core/ext/transport/binder/client/endpoint_binder_pool.cc',
-                      'src/core/ext/transport/binder/client/endpoint_binder_pool.h',
-                      'src/core/ext/transport/binder/client/jni_utils.cc',
-                      'src/core/ext/transport/binder/client/jni_utils.h',
-                      'src/core/ext/transport/binder/client/security_policy_setting.cc',
-                      'src/core/ext/transport/binder/client/security_policy_setting.h',
-                      'src/core/ext/transport/binder/security_policy/binder_security_policy.cc',
-                      'src/core/ext/transport/binder/server/binder_server.cc',
-                      'src/core/ext/transport/binder/server/binder_server.h',
-                      'src/core/ext/transport/binder/server/binder_server_credentials.cc',
-                      'src/core/ext/transport/binder/transport/binder_stream.h',
-                      'src/core/ext/transport/binder/transport/binder_transport.cc',
-                      'src/core/ext/transport/binder/transport/binder_transport.h',
-                      'src/core/ext/transport/binder/utils/binder_auto_utils.h',
-                      'src/core/ext/transport/binder/utils/ndk_binder.cc',
-                      'src/core/ext/transport/binder/utils/ndk_binder.h',
-                      'src/core/ext/transport/binder/utils/transport_stream_receiver.h',
-                      'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc',
-                      'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h',
-                      'src/core/ext/transport/binder/wire_format/binder.h',
-                      'src/core/ext/transport/binder/wire_format/binder_android.cc',
-                      'src/core/ext/transport/binder/wire_format/binder_android.h',
-                      'src/core/ext/transport/binder/wire_format/binder_constants.cc',
-                      'src/core/ext/transport/binder/wire_format/binder_constants.h',
-                      'src/core/ext/transport/binder/wire_format/transaction.cc',
-                      'src/core/ext/transport/binder/wire_format/transaction.h',
-                      'src/core/ext/transport/binder/wire_format/wire_reader.h',
-                      'src/core/ext/transport/binder/wire_format/wire_reader_impl.cc',
-                      'src/core/ext/transport/binder/wire_format/wire_reader_impl.h',
-                      'src/core/ext/transport/binder/wire_format/wire_writer.cc',
-                      'src/core/ext/transport/binder/wire_format/wire_writer.h',
                       'src/core/ext/transport/chttp2/alpn/alpn.h',
                       'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                       'src/core/ext/transport/chttp2/server/chttp2_server.h',
@@ -1636,26 +1595,6 @@ Pod::Spec.new do |s|
                               'src/core/ext/filters/rbac/rbac_service_config_parser.h',
                               'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                               'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
-                              'src/core/ext/transport/binder/client/binder_connector.h',
-                              'src/core/ext/transport/binder/client/channel_create_impl.h',
-                              'src/core/ext/transport/binder/client/connection_id_generator.h',
-                              'src/core/ext/transport/binder/client/endpoint_binder_pool.h',
-                              'src/core/ext/transport/binder/client/jni_utils.h',
-                              'src/core/ext/transport/binder/client/security_policy_setting.h',
-                              'src/core/ext/transport/binder/server/binder_server.h',
-                              'src/core/ext/transport/binder/transport/binder_stream.h',
-                              'src/core/ext/transport/binder/transport/binder_transport.h',
-                              'src/core/ext/transport/binder/utils/binder_auto_utils.h',
-                              'src/core/ext/transport/binder/utils/ndk_binder.h',
-                              'src/core/ext/transport/binder/utils/transport_stream_receiver.h',
-                              'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h',
-                              'src/core/ext/transport/binder/wire_format/binder.h',
-                              'src/core/ext/transport/binder/wire_format/binder_android.h',
-                              'src/core/ext/transport/binder/wire_format/binder_constants.h',
-                              'src/core/ext/transport/binder/wire_format/transaction.h',
-                              'src/core/ext/transport/binder/wire_format/wire_reader.h',
-                              'src/core/ext/transport/binder/wire_format/wire_reader_impl.h',
-                              'src/core/ext/transport/binder/wire_format/wire_writer.h',
                               'src/core/ext/transport/chttp2/alpn/alpn.h',
                               'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                               'src/core/ext/transport/chttp2/server/chttp2_server.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 26ed8c8dfab..a30b17d89f7 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1818,7 +1818,6 @@ Pod::Spec.new do |s|
                       'src/core/load_balancing/xds/xds_wrr_locality.cc',
                       'src/core/plugin_registry/grpc_plugin_registry.cc',
                       'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
-                      'src/core/resolver/binder/binder_resolver.cc',
                       'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
                       'src/core/resolver/dns/c_ares/dns_resolver_ares.h',
                       'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 349abdf9586..01ed6ca79d7 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1704,7 +1704,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/load_balancing/xds/xds_wrr_locality.cc )
   s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )
   s.files += %w( src/core/plugin_registry/grpc_plugin_registry_extra.cc )
-  s.files += %w( src/core/resolver/binder/binder_resolver.cc )
   s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.cc )
   s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.h )
   s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h )
diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h
index 5fb7426af2b..8f0d1fa933c 100644
--- a/include/grpc/support/port_platform.h
+++ b/include/grpc/support/port_platform.h
@@ -172,7 +172,6 @@
 #if __ANDROID_API__ < 21
 #error "Requires Android API v21 and above"
 #endif
-#define GPR_SUPPORT_BINDER_TRANSPORT 1
 // TODO(apolcyn): re-evaluate support for c-ares
 // on android after upgrading our c-ares dependency.
 // See https://github.com/grpc/grpc/issues/18038.
diff --git a/include/grpcpp/security/binder_security_policy.h b/include/grpcpp/security/binder_security_policy.h
deleted file mode 100644
index e1c951fc660..00000000000
--- a/include/grpcpp/security/binder_security_policy.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
-#define GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
-
-#include <memory>
-
-#ifdef GPR_ANDROID
-
-#include <jni.h>
-
-#endif
-
-namespace grpc {
-namespace experimental {
-namespace binder {
-
-// EXPERIMENTAL Determinines if a connection is allowed to be
-// established on Android. See https://source.android.com/security/app-sandbox
-// for more info about UID.
-class SecurityPolicy {
- public:
-  virtual ~SecurityPolicy() = default;
-  // Returns true if the UID is authorized to connect.
-  // Must return the same value for the same inputs so callers can safely cache
-  // the result.
-  virtual bool IsAuthorized(int uid) = 0;
-};
-
-// EXPERIMENTAL Allows all connection. Anything on the Android device will be
-// able to connect, use with caution!
-class UntrustedSecurityPolicy : public SecurityPolicy {
- public:
-  UntrustedSecurityPolicy();
-  ~UntrustedSecurityPolicy() override;
-  bool IsAuthorized(int uid) override;
-};
-
-// EXPERIMENTAL Only allows the connections from processes with the same UID. In
-// most cases this means "from the same APK".
-class InternalOnlySecurityPolicy : public SecurityPolicy {
- public:
-  InternalOnlySecurityPolicy();
-  ~InternalOnlySecurityPolicy() override;
-  bool IsAuthorized(int uid) override;
-};
-
-#ifdef GPR_ANDROID
-
-// EXPERIMENTAL Only allows the connections from the APK that have the same
-// signature.
-class SameSignatureSecurityPolicy : public SecurityPolicy {
- public:
-  // `context` is required for getting PackageManager Java class
-  SameSignatureSecurityPolicy(JavaVM* jvm, jobject context);
-  ~SameSignatureSecurityPolicy() override;
-  bool IsAuthorized(int uid) override;
-
- private:
-  JavaVM* jvm_;
-  jobject context_;
-};
-
-#endif
-
-}  // namespace binder
-}  // namespace experimental
-}  // namespace grpc
-
-#endif  // GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
diff --git a/package.xml b/package.xml
index 3add46c2e40..bf2736bb0bc 100644
--- a/package.xml
+++ b/package.xml
@@ -1686,7 +1686,6 @@
     <file baseinstalldir="/" name="src/core/load_balancing/xds/xds_wrr_locality.cc" role="src" />
     <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
     <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry_extra.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/resolver/binder/binder_resolver.cc" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.cc" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.h" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" role="src" />
diff --git a/src/core/BUILD b/src/core/BUILD
index 5f6adbeb898..5df2ee07cd9 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -33,10 +33,7 @@ package(
 # the top-level BUILD file that have not yet been moved here. Should go away
 # once the transition is complete.
 exports_files(
-    glob(
-        ["**"],
-        exclude = ["ext/transport/binder/java/**"],
-    ),
+    glob(["**"]),
     visibility = ["//:__subpackages__"],
 )
 
@@ -7158,33 +7155,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "grpc_resolver_binder",
-    srcs = [
-        "resolver/binder/binder_resolver.cc",
-    ],
-    external_deps = [
-        "absl/log:log",
-        "absl/status",
-        "absl/status:statusor",
-        "absl/strings",
-    ],
-    language = "c++",
-    deps = [
-        "channel_args",
-        "error",
-        "iomgr_port",
-        "resolved_address",
-        "status_helper",
-        "//:config",
-        "//:endpoint_addresses",
-        "//:gpr",
-        "//:grpc_resolver",
-        "//:orphanable",
-        "//:uri",
-    ],
-)
-
 grpc_cc_library(
     name = "grpc_resolver_xds_attributes",
     hdrs = [
diff --git a/src/core/ext/transport/binder/README.md b/src/core/ext/transport/binder/README.md
deleted file mode 100644
index 74200cd371d..00000000000
--- a/src/core/ext/transport/binder/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Binder transport for cross process IPC on Android
-
-EXPERIMENTAL. API stability not guaranteed.
-
-This transport implements
-[BinderChannel for native cross-process communication on Android](https://github.com/grpc/proposal/blob/master/L73-java-binderchannel.md) and enables C++/Java cross-process communication on Android with gRPC.
-
-Tests: https://github.com/grpc/grpc/tree/master/test/core/transport/binder/
-
-Example apps: https://github.com/grpc/grpc/tree/master/examples/android/binder/java/io/grpc/binder/cpp
diff --git a/src/core/ext/transport/binder/client/channel_create_impl.h b/src/core/ext/transport/binder/client/channel_create_impl.h
deleted file mode 100644
index 0cc87a5a62e..00000000000
--- a/src/core/ext/transport/binder/client/channel_create_impl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/lib/channel/channel_args.h"
-
-namespace grpc {
-namespace internal {
-
-// Creates a GRPC_CLIENT_DIRECT_CHANNEL channel from endpoint binder
-// At this moment this is only used for testing.
-grpc_channel* CreateDirectBinderChannelImplForTesting(
-    std::unique_ptr<grpc_binder::Binder> endpoint_binder,
-    const grpc_channel_args* args,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy);
-
-// Creates a GRPC_CLIENT_CHANNEL channel
-grpc_channel* CreateClientBinderChannelImpl(std::string target,
-                                            const grpc_channel_args* args);
-
-}  // namespace internal
-}  // namespace grpc
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
diff --git a/src/core/ext/transport/binder/client/connection_id_generator.cc b/src/core/ext/transport/binder/client/connection_id_generator.cc
deleted file mode 100644
index 60cba34e31b..00000000000
--- a/src/core/ext/transport/binder/client/connection_id_generator.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/client/connection_id_generator.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
-namespace {
-// Make sure `s` does not contain characters other than numbers, alphabets,
-// period and underscore
-std::string Normalize(absl::string_view str_view) {
-  std::string s = std::string(str_view);
-  for (size_t i = 0; i < s.length(); i++) {
-    if (!isalnum(s[i]) && s[i] != '.') {
-      s[i] = '_';
-    }
-  }
-  return s;
-}
-
-// Remove prefix of the string if the string is longer than len
-std::string StripToLength(const std::string& s, size_t len) {
-  if (s.length() > len) {
-    return s.substr(s.length() - len, len);
-  }
-  return s;
-}
-}  // namespace
-
-namespace grpc_binder {
-
-std::string ConnectionIdGenerator::Generate(absl::string_view uri) {
-  // reserve some room for serial number
-  const size_t kReserveForNumbers = 15;
-  std::string s =
-      StripToLength(Normalize(uri), kPathLengthLimit - kReserveForNumbers);
-  std::string ret;
-  {
-    grpc_core::MutexLock l(&m_);
-    // Insert a hyphen before serial number
-    ret = absl::StrCat(s, "-", ++count_);
-  }
-  CHECK_LT(ret.length(), kPathLengthLimit);
-  return ret;
-}
-
-ConnectionIdGenerator* GetConnectionIdGenerator() {
-  static ConnectionIdGenerator* cig = new ConnectionIdGenerator();
-  return cig;
-}
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/java/WORKSPACE b/src/core/ext/transport/binder/java/WORKSPACE
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
deleted file mode 100644
index 5e63c32bc51..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# copybara: Import internal android_library rule here
-
-licenses(["notice"])
-
-android_library(
-    name = "connection_helper",
-    srcs = [
-        "GrpcBinderConnection.java",
-        "GrpcCppServerBuilder.java",
-        "NativeConnectionHelper.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        # copybara: Add proguard dependency here
-    ],
-)
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
deleted file mode 100644
index b55fe7405e7..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package io.grpc.binder.cpp;
-
-import static android.content.Intent.URI_ANDROID_APP_SCHEME;
-import static android.content.Intent.URI_INTENT_SCHEME;
-
-import android.annotation.TargetApi;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.util.Log;
-import java.net.URISyntaxException;
-
-/* Handles the binder connection state with OnDeviceServer server */
-public class GrpcBinderConnection implements ServiceConnection {
-  private static final String logTag = "GrpcBinderConnection";
-
-  private Context mContext;
-  private IBinder mService;
-
-  // A string that identifies this service connection
-  private final String mConnId;
-
-  public GrpcBinderConnection(Context context, String connId) {
-    mContext = context;
-    mConnId = connId;
-  }
-
-  @Override
-  public void onNullBinding(ComponentName className) {
-    // TODO(mingcl): Notify C++ that the connection is never going to happen
-    Log.e(logTag, "Service returned null IBinder. mConnId = " + mConnId);
-  }
-
-  @Override
-  public void onServiceConnected(ComponentName className, IBinder service) {
-    Log.e(logTag, "Service has connected. mConnId = " + mConnId);
-    if (service == null) {
-      // This should not happen since onNullBinding should be invoked instead
-      throw new IllegalArgumentException("service was null");
-    }
-    synchronized (this) {
-      mService = service;
-    }
-    notifyConnected(mConnId, mService);
-  }
-
-  @Override
-  public void onServiceDisconnected(ComponentName className) {
-    Log.e(logTag, "Service has disconnected. mConnId = " + mConnId);
-  }
-
-  public void tryConnect(String pkg, String cls, String action_name) {
-    Intent intent = new Intent(action_name);
-    ComponentName compName = new ComponentName(pkg, cls);
-    intent.setComponent(compName);
-    tryConnect(intent);
-  }
-
-  @TargetApi(22)
-  public void tryConnect(String uri) {
-    // Try connect with an URI that can be parsed as intent.
-    try {
-      tryConnect(Intent.parseUri(uri, URI_ANDROID_APP_SCHEME | URI_INTENT_SCHEME));
-    } catch (URISyntaxException e) {
-      Log.e(logTag, "Unable to parse the Uri: " + uri);
-    }
-  }
-
-  private void tryConnect(Intent intent) {
-    synchronized (this) {
-      // Will return true if the system is in the process of bringing up a service that your client
-      // has permission to bind to; false if the system couldn't find the service or if your client
-      // doesn't have permission to bind to it
-      boolean result = mContext.bindService(intent, this, Context.BIND_AUTO_CREATE);
-      if (result) {
-        Log.e(logTag, "bindService returns ok");
-      } else {
-        Log.e(
-            logTag,
-            "bindService failed. Maybe the system couldn't find the service or the"
-                + " client doesn't have permission to bind to it.");
-      }
-    }
-  }
-
-  // Calls a function defined in endpoint_binder_pool.cc
-  private static native void notifyConnected(String connId, IBinder service);
-}
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
deleted file mode 100644
index 680a38e5fee..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package io.grpc.binder.cpp;
-
-import android.os.IBinder;
-import android.util.Log;
-
-/* EXPERIMENTAL. Provides a interface to get endpoint binder from C++ */
-public class GrpcCppServerBuilder {
-  private static final String logTag = "GrpcCppServerBuilder";
-
-  public static IBinder GetEndpointBinder(String uri) {
-    String scheme = "binder:";
-    if (uri.startsWith(scheme)) {
-      String path = uri.substring(scheme.length());
-      // TODO(mingcl): Consider if we would like to make sure the path only contain valid
-      // characters here
-      IBinder ibinder = GetEndpointBinderInternal(path);
-      Log.e(logTag, "Returning binder=" + ibinder + " for URI=" + uri);
-      return ibinder;
-    } else {
-      Log.e(logTag, "URI " + uri + " does not start with 'binder:'");
-      return null;
-    }
-  }
-
-  private static native IBinder GetEndpointBinderInternal(String conn_id);
-}
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
deleted file mode 100644
index 6a05c88ff37..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package io.grpc.binder.cpp;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Parcel;
-import android.util.Log;
-// copybara: Import proguard UsedByNative annotation here
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class will be invoked by gRPC binder transport internal implementation (from
- * src/core/ext/transport/binder/client/jni_utils.cc) to perform operations that are only possible
- * in Java
- */
-// copybara: Add @UsedByNative("jni_utils.cc")
-final class NativeConnectionHelper {
-  // Maps connection id to GrpcBinderConnection instances
-  static Map<String, GrpcBinderConnection> connectionIdToGrpcBinderConnectionMap = new HashMap<>();
-
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static void tryEstablishConnection(
-      Context context, String pkg, String cls, String actionName, String connId) {
-    // TODO(mingcl): Assert that connId is unique
-    connectionIdToGrpcBinderConnectionMap.put(connId, new GrpcBinderConnection(context, connId));
-    connectionIdToGrpcBinderConnectionMap.get(connId).tryConnect(pkg, cls, actionName);
-  }
-
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static void tryEstablishConnectionWithUri(Context context, String uri, String connId) {
-    // TODO(mingcl): Assert that connId is unique
-    connectionIdToGrpcBinderConnectionMap.put(connId, new GrpcBinderConnection(context, connId));
-    connectionIdToGrpcBinderConnectionMap.get(connId).tryConnect(uri);
-  }
-
-  // Returns true if the packages signature of the 2 UIDs match.
-  // `context` is used to get PackageManager.
-  // Suppress unnecessary internal warnings related to checkSignatures compatibility issue.
-  // BinderTransport code is only used on newer Android platform versions so this is fine.
-  @SuppressWarnings("CheckSignatures")
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static boolean isSignatureMatch(Context context, int uid1, int uid2) {
-    int result = context.getPackageManager().checkSignatures(uid1, uid2);
-    if (result == PackageManager.SIGNATURE_MATCH) {
-      return true;
-    }
-    Log.e(
-        "NativeConnectionHelper",
-        "Signatures does not match. checkSignature return value = " + result);
-    return false;
-  }
-
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static Parcel getEmptyParcel() {
-    return Parcel.obtain();
-  }
-}
diff --git a/src/core/ext/transport/binder/security_policy/security_policy.h b/src/core/ext/transport/binder/security_policy/security_policy.h
deleted file mode 100644
index 4ef3da352f2..00000000000
--- a/src/core/ext/transport/binder/security_policy/security_policy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
-
-#include <grpc/support/port_platform.h>
-
-namespace grpc {
-namespace experimental {
-namespace binder {
-
-// This interface is for determining if a connection is allowed to be
-// established on Android. See https://source.android.com/security/app-sandbox
-// for more info about UID.
-class SecurityPolicy {
- public:
-  virtual ~SecurityPolicy() = default;
-  // Returns true if the UID is authorized to connect.
-  // Must return the same value for the same inputs so callers can safely cache
-  // the result.
-  virtual bool IsAuthorized(int uid) = 0;
-};
-
-}  // namespace binder
-}  // namespace experimental
-}  // namespace grpc
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
diff --git a/src/core/ext/transport/binder/transport/binder_stream.h b/src/core/ext/transport/binder/transport/binder_stream.h
deleted file mode 100644
index afd0c414514..00000000000
--- a/src/core/ext/transport/binder/transport/binder_stream.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-
-struct RecvInitialMetadataArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-  int tx_code;
-  absl::StatusOr<grpc_binder::Metadata> initial_metadata;
-};
-
-struct RecvMessageArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-  int tx_code;
-  absl::StatusOr<std::string> message;
-};
-
-struct RecvTrailingMetadataArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-  int tx_code;
-  absl::StatusOr<grpc_binder::Metadata> trailing_metadata;
-  int status;
-};
-
-struct RegisterStreamArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-};
-
-// TODO(mingcl): Figure out if we want to use class instead of struct here
-struct grpc_binder_stream {
-  // server_data will be null for client, and for server it will be whatever
-  // passed in to the accept_stream_fn callback by client.
-  grpc_binder_stream(grpc_binder_transport* t, grpc_stream_refcount* refcount,
-                     const void* /*server_data*/, grpc_core::Arena* arena,
-                     int tx_code, bool is_client)
-      : t(t),
-        refcount(refcount),
-        arena(arena),
-        tx_code(tx_code),
-        is_client(is_client),
-        is_closed(false) {
-    recv_initial_metadata_args.stream = this;
-    recv_initial_metadata_args.transport = t;
-    recv_message_args.stream = this;
-    recv_message_args.transport = t;
-    recv_trailing_metadata_args.stream = this;
-    recv_trailing_metadata_args.transport = t;
-  }
-
-  ~grpc_binder_stream() {
-    if (destroy_stream_then_closure != nullptr) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, destroy_stream_then_closure,
-                              absl::OkStatus());
-    }
-  }
-
-  int GetTxCode() const { return tx_code; }
-
-  grpc_binder_transport* t;
-  grpc_stream_refcount* refcount;
-  grpc_core::Arena* arena;
-  int tx_code;
-  const bool is_client;
-  bool is_closed;
-
-  grpc_closure* destroy_stream_then_closure = nullptr;
-  grpc_closure destroy_stream;
-
-  // The reason why this stream is cancelled and closed.
-  grpc_error_handle cancel_self_error;
-
-  grpc_closure recv_initial_metadata_closure;
-  RecvInitialMetadataArgs recv_initial_metadata_args;
-  grpc_closure recv_message_closure;
-  RecvMessageArgs recv_message_args;
-  grpc_closure recv_trailing_metadata_closure;
-  RecvTrailingMetadataArgs recv_trailing_metadata_args;
-
-  grpc_closure register_stream_closure;
-  RegisterStreamArgs register_stream_args;
-
-  // We store these fields passed from op batch, in order to access them through
-  // grpc_binder_stream
-  grpc_metadata_batch* recv_initial_metadata;
-  grpc_closure* recv_initial_metadata_ready = nullptr;
-  bool* trailing_metadata_available = nullptr;
-  absl::optional<grpc_core::SliceBuffer>* recv_message;
-  grpc_closure* recv_message_ready = nullptr;
-  bool* call_failed_before_recv_message = nullptr;
-  grpc_metadata_batch* recv_trailing_metadata;
-  grpc_closure* recv_trailing_metadata_finished = nullptr;
-
-  bool trailing_metadata_sent = false;
-  bool need_to_call_trailing_metadata_callback = false;
-};
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
diff --git a/src/core/ext/transport/binder/utils/binder_auto_utils.h b/src/core/ext/transport/binder/utils/binder_auto_utils.h
deleted file mode 100644
index c72f7760761..00000000000
--- a/src/core/ext/transport/binder/utils/binder_auto_utils.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
-
-#include <grpc/support/port_platform.h>
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include "src/core/ext/transport/binder/utils/ndk_binder.h"
-
-namespace grpc_binder {
-namespace ndk_util {
-
-///
-/// Represents one strong pointer to an AIBinder object.
-/// Copied from binder/ndk/include_cpp/android/binder_auto_utils.h
-///
-class SpAIBinder {
- public:
-  SpAIBinder() : mBinder(nullptr) {}
-  explicit SpAIBinder(AIBinder* binder) : mBinder(binder) {}
-  SpAIBinder(std::nullptr_t)
-      : SpAIBinder() {}  // NOLINT(google-explicit-constructor)
-  SpAIBinder(const SpAIBinder& other) { *this = other; }
-
-  ~SpAIBinder() { set(nullptr); }
-  SpAIBinder& operator=(const SpAIBinder& other) {
-    if (this == &other) {
-      return *this;
-    }
-    AIBinder_incStrong(other.mBinder);
-    set(other.mBinder);
-    return *this;
-  }
-
-  void set(AIBinder* binder) {
-    AIBinder* old = *const_cast<AIBinder* volatile*>(&mBinder);
-    if (old != nullptr) AIBinder_decStrong(old);
-    if (old != *const_cast<AIBinder* volatile*>(&mBinder)) {
-      __assert(__FILE__, __LINE__, "Race detected.");
-    }
-    mBinder = binder;
-  }
-
-  AIBinder* get() const { return mBinder; }
-  AIBinder** getR() { return &mBinder; }
-
-  bool operator!=(const SpAIBinder& rhs) const { return get() != rhs.get(); }
-  bool operator<(const SpAIBinder& rhs) const { return get() < rhs.get(); }
-  bool operator<=(const SpAIBinder& rhs) const { return get() <= rhs.get(); }
-  bool operator==(const SpAIBinder& rhs) const { return get() == rhs.get(); }
-  bool operator>(const SpAIBinder& rhs) const { return get() > rhs.get(); }
-  bool operator>=(const SpAIBinder& rhs) const { return get() >= rhs.get(); }
-
- private:
-  AIBinder* mBinder = nullptr;
-};
-}  // namespace ndk_util
-}  // namespace grpc_binder
-
-#endif
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
diff --git a/src/core/ext/transport/binder/utils/ndk_binder.h b/src/core/ext/transport/binder/utils/ndk_binder.h
deleted file mode 100644
index 1ca82c81625..00000000000
--- a/src/core/ext/transport/binder/utils/ndk_binder.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
-
-#include <grpc/support/port_platform.h>
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <assert.h>
-#include <jni.h>
-
-#include <memory>
-
-// This file defines NdkBinder functions, variables, and types in
-// grpc_binder::ndk_util namespace. This allows us to dynamically load
-// libbinder_ndk at runtime, and make it possible to compile the code without
-// the library present at compile time.
-
-// TODO(mingcl): Consider if we want to check API level and include NDK headers
-// normally if the level is high enough
-
-namespace grpc_binder {
-namespace ndk_util {
-
-struct AIBinder;
-struct AParcel;
-struct AIBinder_Class;
-
-// Only enum values used by the project is defined here
-enum {
-  FLAG_ONEWAY = 0x01,
-};
-enum {
-  STATUS_OK = 0,
-  STATUS_UNKNOWN_ERROR = (-2147483647 - 1),
-};
-
-typedef int32_t binder_status_t;
-typedef uint32_t binder_flags_t;
-typedef uint32_t transaction_code_t;
-
-typedef bool (*AParcel_byteArrayAllocator)(void* arrayData, int32_t length,
-                                           int8_t** outBuffer);
-typedef bool (*AParcel_stringAllocator)(void* stringData, int32_t length,
-                                        char** buffer);
-typedef void* (*AIBinder_Class_onCreate)(void* args);
-typedef void (*AIBinder_Class_onDestroy)(void* userData);
-typedef binder_status_t (*AIBinder_Class_onTransact)(AIBinder* binder,
-                                                     transaction_code_t code,
-                                                     const AParcel* in,
-                                                     AParcel* out);
-
-void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz);
-void* AIBinder_getUserData(AIBinder* binder);
-uid_t AIBinder_getCallingUid();
-AIBinder* AIBinder_fromJavaBinder(JNIEnv* env, jobject binder);
-AIBinder_Class* AIBinder_Class_define(const char* interfaceDescriptor,
-                                      AIBinder_Class_onCreate onCreate,
-                                      AIBinder_Class_onDestroy onDestroy,
-                                      AIBinder_Class_onTransact onTransact);
-AIBinder* AIBinder_new(const AIBinder_Class* clazz, void* args);
-bool AIBinder_associateClass(AIBinder* binder, const AIBinder_Class* clazz);
-void AIBinder_incStrong(AIBinder* binder);
-void AIBinder_decStrong(AIBinder* binder);
-binder_status_t AIBinder_transact(AIBinder* binder, transaction_code_t code,
-                                  AParcel** in, AParcel** out,
-                                  binder_flags_t flags);
-binder_status_t AParcel_readByteArray(const AParcel* parcel, void* arrayData,
-                                      AParcel_byteArrayAllocator allocator);
-void AParcel_delete(AParcel* parcel);
-int32_t AParcel_getDataSize(const AParcel* parcel);
-binder_status_t AParcel_writeInt32(AParcel* parcel, int32_t value);
-binder_status_t AParcel_writeInt64(AParcel* parcel, int64_t value);
-binder_status_t AParcel_writeStrongBinder(AParcel* parcel, AIBinder* binder);
-binder_status_t AParcel_writeString(AParcel* parcel, const char* string,
-                                    int32_t length);
-binder_status_t AParcel_readInt32(const AParcel* parcel, int32_t* value);
-binder_status_t AParcel_readInt64(const AParcel* parcel, int64_t* value);
-binder_status_t AParcel_readString(const AParcel* parcel, void* stringData,
-                                   AParcel_stringAllocator allocator);
-binder_status_t AParcel_readStrongBinder(const AParcel* parcel,
-                                         AIBinder** binder);
-binder_status_t AParcel_writeByteArray(AParcel* parcel, const int8_t* arrayData,
-                                       int32_t length);
-binder_status_t AIBinder_prepareTransaction(AIBinder* binder, AParcel** in);
-jobject AIBinder_toJavaBinder(JNIEnv* env, AIBinder* binder);
-
-}  // namespace ndk_util
-
-}  // namespace grpc_binder
-
-#endif  // GPR_SUPPORT_BINDER_TRANSPORT
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
diff --git a/src/core/ext/transport/binder/wire_format/binder_constants.cc b/src/core/ext/transport/binder/wire_format/binder_constants.cc
deleted file mode 100644
index e9b2439fc64..00000000000
--- a/src/core/ext/transport/binder/wire_format/binder_constants.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/ext/transport/binder/wire_format/binder_constants.h"
-
-ABSL_CONST_INIT const int FIRST_CALL_TRANSACTION = 0x00000001;
-ABSL_CONST_INIT const int LAST_CALL_TRANSACTION = 0x00FFFFFF;
-
-namespace grpc_binder {
-
-ABSL_CONST_INIT const int kFirstCallId = FIRST_CALL_TRANSACTION + 1000;
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/wire_format/transaction.cc b/src/core/ext/transport/binder/wire_format/transaction.cc
deleted file mode 100644
index 9c3bb0225b6..00000000000
--- a/src/core/ext/transport/binder/wire_format/transaction.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/ext/transport/binder/wire_format/transaction.h"
-
-namespace grpc_binder {
-
-ABSL_CONST_INIT const int kFlagPrefix = 0x1;
-ABSL_CONST_INIT const int kFlagMessageData = 0x2;
-ABSL_CONST_INIT const int kFlagSuffix = 0x4;
-ABSL_CONST_INIT const int kFlagOutOfBandClose = 0x8;
-ABSL_CONST_INIT const int kFlagExpectSingleMessage = 0x10;
-ABSL_CONST_INIT const int kFlagStatusDescription = 0x20;
-ABSL_CONST_INIT const int kFlagMessageDataIsParcelable = 0x40;
-ABSL_CONST_INIT const int kFlagMessageDataIsPartial = 0x80;
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc
index 0db484ac828..4022d1f5735 100644
--- a/src/core/plugin_registry/grpc_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_plugin_registry.cc
@@ -72,9 +72,6 @@ extern void RegisterLoadBalancedCallDestination(
 #ifndef GRPC_NO_RLS
 extern void RegisterRlsLbPolicy(CoreConfiguration::Builder* builder);
 #endif  // !GRPC_NO_RLS
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-extern void RegisterBinderResolver(CoreConfiguration::Builder* builder);
-#endif
 
 namespace {
 
@@ -122,9 +119,6 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   RegisterFakeResolver(builder);
   RegisterHttpProxyMapper(builder);
   RegisterLoadBalancedCallDestination(builder);
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-  RegisterBinderResolver(builder);
-#endif
 #ifndef GRPC_NO_RLS
   RegisterRlsLbPolicy(builder);
 #endif  // !GRPC_NO_RLS
diff --git a/src/core/resolver/binder/README.md b/src/core/resolver/binder/README.md
deleted file mode 100644
index b60296765d5..00000000000
--- a/src/core/resolver/binder/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Support for resolving the scheme used by binder transport implementation.
-
-The URI's authority is required to be empty.
-
-The path is used as the identifiers of endpoint binder objects and the length
-limit of the identifier is the same as unix socket length limit.
-
-The length limit of the path should at least be 100 characters long. This is
-guaranteed by `static_assert` in the implementation.
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index e1bbd06531f..d8ca54d31be 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -704,7 +704,6 @@ CORE_SOURCE_FILES = [
     'src/core/load_balancing/xds/xds_wrr_locality.cc',
     'src/core/plugin_registry/grpc_plugin_registry.cc',
     'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
-    'src/core/resolver/binder/binder_resolver.cc',
     'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
     'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
     'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
diff --git a/test/core/resolver/BUILD b/test/core/resolver/BUILD
index effbbac9dad..bf3e38a6f12 100644
--- a/test/core/resolver/BUILD
+++ b/test/core/resolver/BUILD
@@ -36,22 +36,6 @@ grpc_cc_test(
     ],
 )
 
-grpc_cc_test(
-    name = "binder_resolver_test",
-    srcs = ["binder_resolver_test.cc"],
-    external_deps = [
-        "absl/log:log",
-        "gtest",
-    ],
-    language = "C++",
-    deps = [
-        "//:gpr",
-        "//:grpc",
-        "//src/core:grpc_resolver_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
 grpc_cc_test(
     name = "dns_resolver_test",
     srcs = ["dns_resolver_test.cc"],
diff --git a/test/core/transport/binder/BUILD b/test/core/transport/binder/BUILD
deleted file mode 100644
index 1f7d3ebb9a0..00000000000
--- a/test/core/transport/binder/BUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
-
-licenses(["notice"])
-
-grpc_package(
-    name = "test/core/transport/binder",
-    visibility = "tests",
-)
-
-grpc_cc_library(
-    name = "mock_objects",
-    testonly = 1,
-    srcs = ["mock_objects.cc"],
-    hdrs = ["mock_objects.h"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    deps = [
-        "//:grpc++_binder",
-    ],
-)
-
-grpc_cc_test(
-    name = "wire_writer_test",
-    srcs = ["wire_writer_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "wire_reader_test",
-    srcs = ["wire_reader_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "transport_stream_receiver_test",
-    srcs = ["transport_stream_receiver_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "binder_transport_test",
-    srcs = ["binder_transport_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "absl/strings",
-        "gtest",
-    ],
-    language = "C++",
-    tags = [
-        # To avoid `symbolizer buffer too small` warning of UBSAN
-        "noubsan",
-        "no_test_ios",
-    ],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "endpoint_binder_pool_test",
-    srcs = ["endpoint_binder_pool_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
diff --git a/test/core/transport/binder/end2end/BUILD b/test/core/transport/binder/end2end/BUILD
deleted file mode 100644
index 4e9ee2fe2d2..00000000000
--- a/test/core/transport/binder/end2end/BUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
-
-licenses(["notice"])
-
-grpc_package(
-    name = "test/core/transport/binder/end2end",
-    visibility = "tests",
-)
-
-grpc_cc_library(
-    name = "fake_binder",
-    testonly = 1,
-    srcs = ["fake_binder.cc"],
-    hdrs = ["fake_binder.h"],
-    external_deps = [
-        "absl/log:log",
-        "absl/memory",
-        "absl/random",
-        "absl/strings",
-        "absl/strings:str_format",
-        "absl/time",
-        "absl/types:variant",
-    ],
-    deps = [
-        "//:gpr",
-        "//:grpc++_binder",
-    ],
-)
-
-grpc_cc_test(
-    name = "fake_binder_test",
-    srcs = ["fake_binder_test.cc"],
-    external_deps = [
-        "absl/strings",
-        "absl/time",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":fake_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_library(
-    name = "end2end_binder_channel",
-    testonly = 1,
-    srcs = ["testing_channel_create.cc"],
-    hdrs = ["testing_channel_create.h"],
-    external_deps = ["absl/log:check"],
-    deps = [
-        ":fake_binder",
-        "//:grpc++_base",
-        "//:grpc++_binder",
-        "//:grpc_base",
-        "//src/core:channel_args",
-    ],
-)
-
-grpc_cc_test(
-    name = "end2end_binder_transport_test",
-    srcs = ["end2end_binder_transport_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "absl/time",
-        "gtest",
-    ],
-    flaky = True,
-    language = "C++",
-    tags = [
-        # Flaky on windows
-        "no_windows",
-        "no_mac",
-        "no_test_ios",
-
-        # Known race between stream creation and cancellation
-        "notsan",
-    ],
-    deps = [
-        ":end2end_binder_channel",
-        ":fake_binder",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-        "//test/cpp/end2end:test_service_impl",
-    ],
-)
-
-grpc_cc_test(
-    name = "binder_server_test",
-    srcs = ["binder_server_test.cc"],
-    external_deps = [
-        "gtest",
-    ],
-    tags = ["no_test_ios"],
-    deps = [
-        "//:grpc++",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-        "//test/core/transport/binder/end2end:fake_binder",
-        "//test/cpp/end2end:test_service_impl",
-    ],
-)
diff --git a/test/core/transport/binder/end2end/fuzzers/BUILD b/test/core/transport/binder/end2end/fuzzers/BUILD
deleted file mode 100644
index a0184afd3cb..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/BUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_package", "grpc_proto_library")
-load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
-
-grpc_package(
-    name = "test/core/transport/binder/end2end/fuzzers",
-    features = [
-        "layering_check",
-    ],
-)
-
-licenses(["notice"])
-
-# Protobuf messages for generating inputs. We manually define proto
-# library rule here so the same proto file can be shared between multiple
-# grpc_proto_fuzzer targets
-grpc_proto_library(
-    name = "binder_transport_fuzzer_proto",
-    srcs = ["binder_transport_fuzzer.proto"],
-)
-
-grpc_cc_library(
-    name = "fuzzer_utils",
-    srcs = ["fuzzer_utils.cc"],
-    external_deps = [
-        "absl/log:check",
-        "absl/log:log",
-    ],
-    language = "c++",
-    public_hdrs = ["fuzzer_utils.h"],
-    deps = [
-        "binder_transport_fuzzer_proto",
-        "//:gpr",
-        "//:grpc++",
-        "//:grpc++_base",
-        "//:grpc_base",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_proto_fuzzer(
-    name = "binder_transport_client_fuzzer",
-    srcs = [
-        "client_fuzzer.cc",
-    ],
-    corpus = "binder_transport_client_fuzzer_corpus",
-    external_deps = ["absl/log:check"],
-    owner = "binder",
-    proto = "client.proto",
-    tags = [
-        "no_mac",
-        "no_windows",
-    ],
-    deps = [
-        "binder_transport_fuzzer_proto",
-        ":fuzzer_utils",
-        "//:gpr",
-        "//:grpc++",
-        "//:grpc++_base",
-        "//:grpc_base",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_proto_fuzzer(
-    name = "binder_transport_server_fuzzer",
-    srcs = [
-        "server_fuzzer.cc",
-    ],
-    corpus = "binder_transport_server_fuzzer_corpus",
-    external_deps = ["absl/log:check"],
-    owner = "binder",
-    proto = "server.proto",
-    tags = [
-        "no_mac",
-        "no_windows",
-    ],
-    deps = [
-        "binder_transport_fuzzer_proto",
-        ":fuzzer_utils",
-        "//:gpr",
-        "//:grpc++",
-        "//:grpc++_base",
-        "//:grpc_base",
-        "//src/core:slice",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty b/test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto b/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
deleted file mode 100644
index 8fb2aa3edd1..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package binder_transport_fuzzer;
-
-message Binder {}
-
-message Value {
-  oneof data_type {
-    int32 i32 = 1;
-    int64 i64 = 2;
-    bytes byte_array = 3;
-    // Strings in Parcel could also contain non UTF-8 data so we use bytes
-    // to represent string here
-    bytes str = 4;
-    Binder binder = 5;
-  }
-}
-
-message Parcel {
-  repeated Value values = 1;
-
-  // Simulates the return value of AParcel_getDataSize
-  // (The value generated by protobuf libprotobuf-mutator might not always make sense
-  // but the transport implementation should handle that)
-  int32 data_size = 2;
-}
-
-enum TransactionCode {
-  INVALID = 0;
-  SETUP_TRANSPORT = 1;
-  SHUTDOWN_TRANSPORT = 2;
-  ACKNOWLEDGE_BYTES = 3;
-  PING = 4;
-  PING_RESPONSE = 5;
-}
-
-message Transaction {
-  TransactionCode code = 1;
-  int32 uid = 2;
-  Parcel parcel = 3;
-}
-
-// Special parcel that used for setting up transport.
-// TODO(mingcl): Consider also fuzzing the setup transport code path
-message SetupTransportParcel {
-  int32 version = 1;
-
-  // Simulates the return value of AParcel_getDataSize
-  // (The value generated by protobuf libprotobuf-mutator might not always make sense
-  // but the transport implementation should handle that)
-  int32 data_size = 2;
-}
-
-message SetupTransportTransaction {
-  int32 uid = 1;
-  SetupTransportParcel parcel = 2;
-}
-
-message IncomingParcels {
-  SetupTransportTransaction setup_transport_transaction = 1;
-  repeated Transaction transactions = 2;
-}
-
-message Input {
-  IncomingParcels incoming_parcels = 1;
-}
-
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty b/test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/core/transport/binder/end2end/fuzzers/client.proto b/test/core/transport/binder/end2end/fuzzers/client.proto
deleted file mode 100644
index 4fe133a7d24..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/client.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package binder_transport_fuzzer;
diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
deleted file mode 100644
index 11609ac92f8..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h"
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
-namespace grpc_binder {
-namespace fuzzing {
-
-namespace {
-
-std::thread* g_fuzzing_thread = nullptr;
-
-template <typename... Args>
-void CreateFuzzingThread(Args&&... args) {
-  CHECK_EQ(g_fuzzing_thread, nullptr);
-  g_fuzzing_thread = new std::thread(std::forward<Args>(args)...);
-}
-
-}  // namespace
-
-void JoinFuzzingThread() {
-  if (g_fuzzing_thread) {
-    g_fuzzing_thread->join();
-    delete g_fuzzing_thread;
-    g_fuzzing_thread = nullptr;
-  }
-}
-
-int32_t ReadableParcelForFuzzing::GetDataSize() const {
-  return parcel_data_size_;
-}
-
-absl::Status ReadableParcelForFuzzing::ReadInt32(int32_t* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_i32()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().i32();
-  values_.pop();
-  consumed_data_size_ += sizeof(int32_t);
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadInt64(int64_t* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_i64()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().i64();
-  values_.pop();
-  consumed_data_size_ += sizeof(int64_t);
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadBinder(
-    std::unique_ptr<Binder>* binder) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_binder()) {
-    return absl::InternalError("error");
-  }
-  *binder = std::make_unique<BinderForFuzzing>();
-  values_.pop();
-  consumed_data_size_ += sizeof(void*);
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadByteArray(std::string* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_byte_array()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().byte_array();
-  values_.pop();
-  consumed_data_size_ += data->size();
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadString(std::string* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_str()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().str();
-  values_.pop();
-  consumed_data_size_ += data->size();
-  return absl::OkStatus();
-}
-
-void FuzzingLoop(
-    binder_transport_fuzzer::IncomingParcels incoming_parcels,
-    grpc_core::RefCountedPtr<grpc_binder::WireReader> wire_reader_ref,
-    grpc_binder::TransactionReceiver::OnTransactCb callback) {
-  {
-    // Send SETUP_TRANSPORT request.
-    std::unique_ptr<grpc_binder::ReadableParcel> parcel =
-        std::make_unique<ReadableParcelForFuzzing>(
-            incoming_parcels.setup_transport_transaction().parcel());
-    callback(static_cast<transaction_code_t>(
-                 grpc_binder::BinderTransportTxCode::SETUP_TRANSPORT),
-             parcel.get(),
-             /*uid=*/incoming_parcels.setup_transport_transaction().uid())
-        .IgnoreError();
-  }
-  for (const auto& tx_iter : incoming_parcels.transactions()) {
-    transaction_code_t tx_code = tx_iter.code();
-    std::unique_ptr<grpc_binder::ReadableParcel> parcel =
-        std::make_unique<ReadableParcelForFuzzing>(tx_iter.parcel());
-    callback(tx_code, parcel.get(),
-             /*uid=*/tx_iter.uid())
-        .IgnoreError();
-  }
-  wire_reader_ref = nullptr;
-}
-
-TransactionReceiverForFuzzing::TransactionReceiverForFuzzing(
-    binder_transport_fuzzer::IncomingParcels incoming_parcels,
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb cb) {
-  LOG(INFO) << "Construct TransactionReceiverForFuzzing";
-  CreateFuzzingThread(FuzzingLoop, std::move(incoming_parcels),
-                      std::move(wire_reader_ref), std::move(cb));
-}
-
-std::unique_ptr<TransactionReceiver> BinderForFuzzing::ConstructTxReceiver(
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb cb) const {
-  auto tx_receiver = std::make_unique<TransactionReceiverForFuzzing>(
-      incoming_parcels_, wire_reader_ref, cb);
-  return tx_receiver;
-}
-
-}  // namespace fuzzing
-}  // namespace grpc_binder
diff --git a/test/core/transport/binder/end2end/fuzzers/server.proto b/test/core/transport/binder/end2end/fuzzers/server.proto
deleted file mode 100644
index 4fe133a7d24..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/server.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package binder_transport_fuzzer;
diff --git a/test/core/transport/binder/mock_objects.cc b/test/core/transport/binder/mock_objects.cc
deleted file mode 100644
index 7e173ef15ad..00000000000
--- a/test/core/transport/binder/mock_objects.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "test/core/transport/binder/mock_objects.h"
-
-#include <memory>
-
-#include "absl/memory/memory.h"
-
-namespace grpc_binder {
-
-using ::testing::Return;
-
-MockReadableParcel::MockReadableParcel() {
-  ON_CALL(*this, ReadBinder).WillByDefault([](std::unique_ptr<Binder>* binder) {
-    *binder = std::make_unique<MockBinder>();
-    return absl::OkStatus();
-  });
-  ON_CALL(*this, ReadInt32).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, ReadByteArray).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, ReadString).WillByDefault(Return(absl::OkStatus()));
-}
-
-MockWritableParcel::MockWritableParcel() {
-  ON_CALL(*this, WriteInt32).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, WriteBinder).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, WriteString).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, WriteByteArray).WillByDefault(Return(absl::OkStatus()));
-}
-
-MockBinder::MockBinder() {
-  ON_CALL(*this, PrepareTransaction).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, Transact).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, GetWritableParcel).WillByDefault(Return(&mock_input_));
-  ON_CALL(*this, ConstructTxReceiver)
-      .WillByDefault(
-          [this](grpc_core::RefCountedPtr<WireReader> /*wire_reader_ref*/,
-                 TransactionReceiver::OnTransactCb cb) {
-            return std::make_unique<MockTransactionReceiver>(
-                cb, BinderTransportTxCode::SETUP_TRANSPORT, &mock_output_);
-          });
-}
-
-}  // namespace grpc_binder
diff --git a/test/core/transport/binder/mock_objects.h b/test/core/transport/binder/mock_objects.h
deleted file mode 100644
index 6424a2acd22..00000000000
--- a/test/core/transport/binder/mock_objects.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
-#define GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
-
-#include <gmock/gmock.h>
-
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/binder_constants.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-
-namespace grpc_binder {
-
-class MockWritableParcel : public WritableParcel {
- public:
-  MOCK_METHOD(int32_t, GetDataSize, (), (const, override));
-  MOCK_METHOD(absl::Status, WriteInt32, (int32_t), (override));
-  MOCK_METHOD(absl::Status, WriteInt64, (int64_t), (override));
-  MOCK_METHOD(absl::Status, WriteBinder, (HasRawBinder*), (override));
-  MOCK_METHOD(absl::Status, WriteString, (absl::string_view), (override));
-  MOCK_METHOD(absl::Status, WriteByteArray, (const int8_t*, int32_t),
-              (override));
-
-  MockWritableParcel();
-};
-
-class MockReadableParcel : public ReadableParcel {
- public:
-  MOCK_METHOD(int32_t, GetDataSize, (), (const, override));
-  MOCK_METHOD(absl::Status, ReadInt32, (int32_t*), (override));
-  MOCK_METHOD(absl::Status, ReadInt64, (int64_t*), (override));
-  MOCK_METHOD(absl::Status, ReadBinder, (std::unique_ptr<Binder>*), (override));
-  MOCK_METHOD(absl::Status, ReadByteArray, (std::string*), (override));
-  MOCK_METHOD(absl::Status, ReadString, (std::string*), (override));
-
-  MockReadableParcel();
-};
-
-class MockBinder : public Binder {
- public:
-  MOCK_METHOD(void, Initialize, (), (override));
-  MOCK_METHOD(absl::Status, PrepareTransaction, (), (override));
-  MOCK_METHOD(absl::Status, Transact, (BinderTransportTxCode), (override));
-  MOCK_METHOD(WritableParcel*, GetWritableParcel, (), (const, override));
-  MOCK_METHOD(std::unique_ptr<TransactionReceiver>, ConstructTxReceiver,
-              (grpc_core::RefCountedPtr<WireReader>,
-               TransactionReceiver::OnTransactCb),
-              (const, override));
-  MOCK_METHOD(void*, GetRawBinder, (), (override));
-
-  MockBinder();
-  MockWritableParcel& GetWriter() { return mock_input_; }
-  MockReadableParcel& GetReader() { return mock_output_; }
-
- private:
-  MockWritableParcel mock_input_;
-  MockReadableParcel mock_output_;
-};
-
-// TODO(waynetu): Implement transaction injection later for more thorough
-// testing.
-class MockTransactionReceiver : public TransactionReceiver {
- public:
-  explicit MockTransactionReceiver(OnTransactCb transact_cb,
-                                   BinderTransportTxCode code,
-                                   MockReadableParcel* output) {
-    if (code == BinderTransportTxCode::SETUP_TRANSPORT) {
-      EXPECT_CALL(*output, ReadInt32).WillOnce([](int32_t* version) {
-        *version = 1;
-        return absl::OkStatus();
-      });
-    }
-    transact_cb(static_cast<transaction_code_t>(code), output, /*uid=*/0)
-        .IgnoreError();
-  }
-
-  MOCK_METHOD(void*, GetRawBinder, (), (override));
-};
-
-class MockWireWriter : public WireWriter {
- public:
-  MOCK_METHOD(absl::Status, RpcCall, (std::unique_ptr<Transaction>),
-              (override));
-  MOCK_METHOD(absl::Status, SendAck, (int64_t), (override));
-  MOCK_METHOD(void, OnAckReceived, (int64_t), (override));
-};
-
-class MockTransportStreamReceiver : public TransportStreamReceiver {
- public:
-  MOCK_METHOD(void, RegisterRecvInitialMetadata,
-              (StreamIdentifier, InitialMetadataCallbackType), (override));
-  MOCK_METHOD(void, RegisterRecvMessage,
-              (StreamIdentifier, MessageDataCallbackType), (override));
-  MOCK_METHOD(void, RegisterRecvTrailingMetadata,
-              (StreamIdentifier, TrailingMetadataCallbackType), (override));
-  MOCK_METHOD(void, NotifyRecvInitialMetadata,
-              (StreamIdentifier, absl::StatusOr<Metadata>), (override));
-  MOCK_METHOD(void, NotifyRecvMessage,
-              (StreamIdentifier, absl::StatusOr<std::string>), (override));
-  MOCK_METHOD(void, NotifyRecvTrailingMetadata,
-              (StreamIdentifier, absl::StatusOr<Metadata>, int), (override));
-  MOCK_METHOD(void, CancelStream, (StreamIdentifier), (override));
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 396a70209f2..e79c61376ab 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -960,7 +960,6 @@ include/grpcpp/channel.h \
 include/grpcpp/client_context.h \
 include/grpcpp/completion_queue.h \
 include/grpcpp/create_channel.h \
-include/grpcpp/create_channel_binder.h \
 include/grpcpp/create_channel_posix.h \
 include/grpcpp/ext/call_metric_recorder.h \
 include/grpcpp/ext/health_check_service_server_builder_option.h \
@@ -1052,8 +1051,6 @@ include/grpcpp/security/audit_logging.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/authorization_policy_provider.h \
-include/grpcpp/security/binder_credentials.h \
-include/grpcpp/security/binder_security_policy.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/tls_certificate_provider.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 4147fafc791..3c732935f0c 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -960,7 +960,6 @@ include/grpcpp/channel.h \
 include/grpcpp/client_context.h \
 include/grpcpp/completion_queue.h \
 include/grpcpp/create_channel.h \
-include/grpcpp/create_channel_binder.h \
 include/grpcpp/create_channel_posix.h \
 include/grpcpp/ext/call_metric_recorder.h \
 include/grpcpp/ext/health_check_service_server_builder_option.h \
@@ -1052,8 +1051,6 @@ include/grpcpp/security/audit_logging.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/authorization_policy_provider.h \
-include/grpcpp/security/binder_credentials.h \
-include/grpcpp/security/binder_security_policy.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/tls_certificate_provider.h \
@@ -1173,44 +1170,6 @@ src/core/ext/filters/stateful_session/stateful_session_filter.cc \
 src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h \
-src/core/ext/transport/binder/client/binder_connector.cc \
-src/core/ext/transport/binder/client/binder_connector.h \
-src/core/ext/transport/binder/client/channel_create.cc \
-src/core/ext/transport/binder/client/channel_create_impl.cc \
-src/core/ext/transport/binder/client/channel_create_impl.h \
-src/core/ext/transport/binder/client/connection_id_generator.cc \
-src/core/ext/transport/binder/client/connection_id_generator.h \
-src/core/ext/transport/binder/client/endpoint_binder_pool.cc \
-src/core/ext/transport/binder/client/endpoint_binder_pool.h \
-src/core/ext/transport/binder/client/jni_utils.cc \
-src/core/ext/transport/binder/client/jni_utils.h \
-src/core/ext/transport/binder/client/security_policy_setting.cc \
-src/core/ext/transport/binder/client/security_policy_setting.h \
-src/core/ext/transport/binder/security_policy/binder_security_policy.cc \
-src/core/ext/transport/binder/server/binder_server.cc \
-src/core/ext/transport/binder/server/binder_server.h \
-src/core/ext/transport/binder/server/binder_server_credentials.cc \
-src/core/ext/transport/binder/transport/binder_stream.h \
-src/core/ext/transport/binder/transport/binder_transport.cc \
-src/core/ext/transport/binder/transport/binder_transport.h \
-src/core/ext/transport/binder/utils/binder_auto_utils.h \
-src/core/ext/transport/binder/utils/ndk_binder.cc \
-src/core/ext/transport/binder/utils/ndk_binder.h \
-src/core/ext/transport/binder/utils/transport_stream_receiver.h \
-src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc \
-src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h \
-src/core/ext/transport/binder/wire_format/binder.h \
-src/core/ext/transport/binder/wire_format/binder_android.cc \
-src/core/ext/transport/binder/wire_format/binder_android.h \
-src/core/ext/transport/binder/wire_format/binder_constants.cc \
-src/core/ext/transport/binder/wire_format/binder_constants.h \
-src/core/ext/transport/binder/wire_format/transaction.cc \
-src/core/ext/transport/binder/wire_format/transaction.h \
-src/core/ext/transport/binder/wire_format/wire_reader.h \
-src/core/ext/transport/binder/wire_format/wire_reader_impl.cc \
-src/core/ext/transport/binder/wire_format/wire_reader_impl.h \
-src/core/ext/transport/binder/wire_format/wire_writer.cc \
-src/core/ext/transport/binder/wire_format/wire_writer.h \
 src/core/ext/transport/chttp2/alpn/alpn.cc \
 src/core/ext/transport/chttp2/alpn/alpn.h \
 src/core/ext/transport/chttp2/client/chttp2_connector.cc \
@@ -2709,7 +2668,6 @@ src/core/load_balancing/xds/xds_override_host.h \
 src/core/load_balancing/xds/xds_wrr_locality.cc \
 src/core/plugin_registry/grpc_plugin_registry.cc \
 src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-src/core/resolver/binder/binder_resolver.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.h \
 src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index cf962517d9e..ae593862758 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -975,7 +975,6 @@ src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h \
 src/core/ext/transport/README.md \
-src/core/ext/transport/binder/README.md \
 src/core/ext/transport/chttp2/README.md \
 src/core/ext/transport/chttp2/alpn/alpn.cc \
 src/core/ext/transport/chttp2/alpn/alpn.h \
@@ -2482,8 +2481,6 @@ src/core/load_balancing/xds/xds_wrr_locality.cc \
 src/core/plugin_registry/grpc_plugin_registry.cc \
 src/core/plugin_registry/grpc_plugin_registry_extra.cc \
 src/core/resolver/README.md \
-src/core/resolver/binder/README.md \
-src/core/resolver/binder/binder_resolver.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.h \
 src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
diff --git a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
deleted file mode 100755
index 300cace3a37..00000000000
--- a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-echo $ANDROID_HOME
-echo $ANDROID_NDK_HOME
-
-# Android platforms only works with Bazel >= 7.0
-export OVERRIDE_BAZEL_VERSION=7.3.1
-
-python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_binder_example_app
-bazel_binder_example_app/bazel_wrapper \
-  --bazelrc=tools/remote_build/include/test_locally_with_resultstore_results.bazelrc \
-  build \
-  --extra_toolchains=@androidndk//:all \
-  --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \
-  //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app \
-  //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app
-
-# Make sure the Java code that will be invoked by binder transport
-# implementation builds
-python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_binder_connection_helper
-bazel_binder_connection_helper/bazel_wrapper \
-  --bazelrc=tools/remote_build/include/test_locally_with_resultstore_results.bazelrc \
-  build \
-  --define=use_strict_warning=true \
-  @binder_transport_android_helper//io/grpc/binder/cpp:connection_helper
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 991313c58b5..46054ee4dea 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -1065,78 +1065,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "binder_resolver_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "binder_server_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "binder_transport_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -3195,30 +3123,6 @@
     ],
     "uses_polling": false
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "endpoint_binder_pool_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -3575,30 +3479,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "fake_binder_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -11443,30 +11323,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "transport_stream_receiver_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -11893,54 +11749,6 @@
     ],
     "uses_polling": false
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "wire_reader_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "wire_writer_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,

From 7bdfd32f46b2479e51e805c6de32111614a9ca32 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 8 Oct 2024 14:08:56 -0700
Subject: [PATCH 44/74] [orca_service_e2e_test] log elapsed time between
 responses (#37871)

This will help debug some recent flakes.

Closes #37871

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37871 from markdroth:orca_flake_fix a09453ca0b3a1f86c79f36ea34337385ef38a260
PiperOrigin-RevId: 683758545
---
 test/cpp/end2end/orca_service_end2end_test.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cpp/end2end/orca_service_end2end_test.cc b/test/cpp/end2end/orca_service_end2end_test.cc
index 5bc12964b20..6c219f57c10 100644
--- a/test/cpp/end2end/orca_service_end2end_test.cc
+++ b/test/cpp/end2end/orca_service_end2end_test.cc
@@ -76,6 +76,7 @@ class OrcaServiceEnd2endTest : public ::testing::Test {
             grpc_core::Duration::Milliseconds(750) *
             grpc_test_slowdown_factor();
         auto elapsed = now - *last_response_time_;
+        LOG(INFO) << "received ORCA response after " << elapsed;
         EXPECT_GE(elapsed, requested_interval_ - fudge_factor)
             << elapsed.ToString();
         EXPECT_LE(elapsed, requested_interval_ + fudge_factor)

From b41b323fbe25a5382f4354450363fe804fafbee2 Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Tue, 8 Oct 2024 15:53:59 -0700
Subject: [PATCH 45/74] Automated rollback of commit
 4abd199841751c7d956287d88660d10228272c2b.

PiperOrigin-RevId: 683793486
---
 BUILD                                         | 133 +++
 CMakeLists.txt                                | 910 +++++++++++++++++-
 Makefile                                      |   1 +
 Package.swift                                 |   1 +
 WORKSPACE                                     |  10 +
 build_autogenerated.yaml                      | 765 +++++++++++++++
 config.m4                                     |   2 +
 config.w32                                    |   2 +
 gRPC-C++.podspec                              |  61 ++
 gRPC-Core.podspec                             |   1 +
 grpc.gemspec                                  |   1 +
 include/grpc/support/port_platform.h          |   1 +
 .../grpcpp/security/binder_security_policy.h  |  82 ++
 package.xml                                   |   1 +
 src/core/BUILD                                |  32 +-
 src/core/ext/transport/binder/README.md       |  10 +
 .../binder/client/channel_create_impl.h       |  42 +
 .../binder/client/connection_id_generator.cc  |  69 ++
 src/core/ext/transport/binder/java/WORKSPACE  |   0
 .../binder/java/io/grpc/binder/cpp/BUILD      |  30 +
 .../grpc/binder/cpp/GrpcBinderConnection.java | 104 ++
 .../grpc/binder/cpp/GrpcCppServerBuilder.java |  40 +
 .../binder/cpp/NativeConnectionHelper.java    |  71 ++
 .../binder/security_policy/security_policy.h  |  40 +
 .../binder/transport/binder_stream.h          | 117 +++
 .../binder/utils/binder_auto_utils.h          |  76 ++
 .../ext/transport/binder/utils/ndk_binder.h   | 107 ++
 .../binder/wire_format/binder_constants.cc    |  29 +
 .../binder/wire_format/transaction.cc         |  33 +
 .../plugin_registry/grpc_plugin_registry.cc   |   6 +
 src/core/resolver/binder/README.md            |   9 +
 src/python/grpcio/grpc_core_dependencies.py   |   1 +
 test/core/resolver/BUILD                      |  16 +
 test/core/transport/binder/BUILD              | 133 +++
 test/core/transport/binder/end2end/BUILD      | 119 +++
 .../transport/binder/end2end/fuzzers/BUILD    | 101 ++
 .../empty                                     |   0
 .../fuzzers/binder_transport_fuzzer.proto     |  81 ++
 .../empty                                     |   0
 .../binder/end2end/fuzzers/client.proto       |  17 +
 .../binder/end2end/fuzzers/fuzzer_utils.cc    | 157 +++
 .../binder/end2end/fuzzers/server.proto       |  17 +
 test/core/transport/binder/mock_objects.cc    |  55 ++
 test/core/transport/binder/mock_objects.h     | 121 +++
 tools/doxygen/Doxyfile.c++                    |   3 +
 tools/doxygen/Doxyfile.c++.internal           |  42 +
 tools/doxygen/Doxyfile.core.internal          |   3 +
 ...pc_binder_transport_apk_build_in_docker.sh |  40 +
 tools/run_tests/generated/tests.json          | 192 ++++
 49 files changed, 3861 insertions(+), 23 deletions(-)
 create mode 100644 include/grpcpp/security/binder_security_policy.h
 create mode 100644 src/core/ext/transport/binder/README.md
 create mode 100644 src/core/ext/transport/binder/client/channel_create_impl.h
 create mode 100644 src/core/ext/transport/binder/client/connection_id_generator.cc
 create mode 100644 src/core/ext/transport/binder/java/WORKSPACE
 create mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
 create mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
 create mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
 create mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
 create mode 100644 src/core/ext/transport/binder/security_policy/security_policy.h
 create mode 100644 src/core/ext/transport/binder/transport/binder_stream.h
 create mode 100644 src/core/ext/transport/binder/utils/binder_auto_utils.h
 create mode 100644 src/core/ext/transport/binder/utils/ndk_binder.h
 create mode 100644 src/core/ext/transport/binder/wire_format/binder_constants.cc
 create mode 100644 src/core/ext/transport/binder/wire_format/transaction.cc
 create mode 100644 src/core/resolver/binder/README.md
 create mode 100644 test/core/transport/binder/BUILD
 create mode 100644 test/core/transport/binder/end2end/BUILD
 create mode 100644 test/core/transport/binder/end2end/fuzzers/BUILD
 create mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty
 create mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
 create mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty
 create mode 100644 test/core/transport/binder/end2end/fuzzers/client.proto
 create mode 100644 test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
 create mode 100644 test/core/transport/binder/end2end/fuzzers/server.proto
 create mode 100644 test/core/transport/binder/mock_objects.cc
 create mode 100644 test/core/transport/binder/mock_objects.h
 create mode 100755 tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh

diff --git a/BUILD b/BUILD
index b737fb5ecdb..4d57a053c1f 100644
--- a/BUILD
+++ b/BUILD
@@ -74,6 +74,17 @@ config_setting(
     flag_values = {":disable_grpc_rls": "true"},
 )
 
+# When gRPC is build as shared library, binder transport code might still
+# get included even when user's code does not depend on it. In that case
+# --define=grpc_no_binder=true can be used to disable binder transport
+# related code to reduce binary size.
+# For users using build system other than bazel, they can define
+# GRPC_NO_BINDER to achieve the same effect.
+config_setting(
+    name = "grpc_no_binder_define",
+    values = {"define": "grpc_no_binder=true"},
+)
+
 config_setting(
     name = "android",
     values = {"crosstool_top": "//external:android/crosstool"},
@@ -124,6 +135,15 @@ selects.config_setting_group(
     ],
 )
 
+selects.config_setting_group(
+    name = "grpc_no_binder",
+    match_any = [
+        ":grpc_no_binder_define",
+        # We do not need binder on ios.
+        ":ios",
+    ],
+)
+
 selects.config_setting_group(
     name = "grpc_no_rls",
     match_any = [
@@ -835,6 +855,7 @@ grpc_cc_library(
         "//src/core:grpc_lb_policy_weighted_target",
         "//src/core:grpc_channel_idle_filter",
         "//src/core:grpc_message_size_filter",
+        "//src/core:grpc_resolver_binder",
         "grpc_resolver_dns_ares",
         "grpc_resolver_fake",
         "//src/core:grpc_resolver_dns_native",
@@ -920,6 +941,12 @@ grpc_cc_library(
                 "grpc++_xds_server",
             ],
         },
+        {
+            "grpc_no_binder": [],
+            "//conditions:default": [
+                "grpc++_binder",
+            ],
+        },
     ],
     tags = ["nofixdeps"],
     visibility = ["@grpc:public"],
@@ -1050,6 +1077,112 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "grpc++_binder",
+    srcs = [
+        "//src/core:ext/transport/binder/client/binder_connector.cc",
+        "//src/core:ext/transport/binder/client/channel_create.cc",
+        "//src/core:ext/transport/binder/client/channel_create_impl.cc",
+        "//src/core:ext/transport/binder/client/connection_id_generator.cc",
+        "//src/core:ext/transport/binder/client/endpoint_binder_pool.cc",
+        "//src/core:ext/transport/binder/client/jni_utils.cc",
+        "//src/core:ext/transport/binder/client/security_policy_setting.cc",
+        "//src/core:ext/transport/binder/security_policy/binder_security_policy.cc",
+        "//src/core:ext/transport/binder/server/binder_server.cc",
+        "//src/core:ext/transport/binder/server/binder_server_credentials.cc",
+        "//src/core:ext/transport/binder/transport/binder_transport.cc",
+        "//src/core:ext/transport/binder/utils/ndk_binder.cc",
+        "//src/core:ext/transport/binder/utils/transport_stream_receiver_impl.cc",
+        "//src/core:ext/transport/binder/wire_format/binder_android.cc",
+        "//src/core:ext/transport/binder/wire_format/binder_constants.cc",
+        "//src/core:ext/transport/binder/wire_format/transaction.cc",
+        "//src/core:ext/transport/binder/wire_format/wire_reader_impl.cc",
+        "//src/core:ext/transport/binder/wire_format/wire_writer.cc",
+    ],
+    hdrs = [
+        "//src/core:ext/transport/binder/client/binder_connector.h",
+        "//src/core:ext/transport/binder/client/channel_create_impl.h",
+        "//src/core:ext/transport/binder/client/connection_id_generator.h",
+        "//src/core:ext/transport/binder/client/endpoint_binder_pool.h",
+        "//src/core:ext/transport/binder/client/jni_utils.h",
+        "//src/core:ext/transport/binder/client/security_policy_setting.h",
+        "//src/core:ext/transport/binder/server/binder_server.h",
+        "//src/core:ext/transport/binder/transport/binder_stream.h",
+        "//src/core:ext/transport/binder/transport/binder_transport.h",
+        "//src/core:ext/transport/binder/utils/binder_auto_utils.h",
+        "//src/core:ext/transport/binder/utils/ndk_binder.h",
+        "//src/core:ext/transport/binder/utils/transport_stream_receiver.h",
+        "//src/core:ext/transport/binder/utils/transport_stream_receiver_impl.h",
+        "//src/core:ext/transport/binder/wire_format/binder.h",
+        "//src/core:ext/transport/binder/wire_format/binder_android.h",
+        "//src/core:ext/transport/binder/wire_format/binder_constants.h",
+        "//src/core:ext/transport/binder/wire_format/transaction.h",
+        "//src/core:ext/transport/binder/wire_format/wire_reader.h",
+        "//src/core:ext/transport/binder/wire_format/wire_reader_impl.h",
+        "//src/core:ext/transport/binder/wire_format/wire_writer.h",
+    ],
+    defines = select({
+        "grpc_no_binder": ["GRPC_NO_BINDER"],
+        "//conditions:default": [],
+    }),
+    external_deps = [
+        "absl/base:core_headers",
+        "absl/cleanup",
+        "absl/container:flat_hash_map",
+        "absl/functional:any_invocable",
+        "absl/hash",
+        "absl/log:check",
+        "absl/log:log",
+        "absl/memory",
+        "absl/meta:type_traits",
+        "absl/status",
+        "absl/status:statusor",
+        "absl/strings",
+        "absl/synchronization",
+        "absl/time",
+        "absl/types:variant",
+    ],
+    language = "c++",
+    public_hdrs = [
+        "include/grpcpp/security/binder_security_policy.h",
+        "include/grpcpp/create_channel_binder.h",
+        "include/grpcpp/security/binder_credentials.h",
+    ],
+    tags = ["nofixdeps"],
+    deps = [
+        "channel",
+        "channel_create",
+        "config",
+        "debug_location",
+        "exec_ctx",
+        "gpr",
+        "gpr_platform",
+        "grpc",
+        "grpc++_base",
+        "grpc_base",
+        "grpc_client_channel",
+        "grpc_public_hdrs",
+        "orphanable",
+        "ref_counted_ptr",
+        "server",
+        "//src/core:arena",
+        "//src/core:channel_args",
+        "//src/core:channel_args_preconditioning",
+        "//src/core:channel_stack_type",
+        "//src/core:default_event_engine",
+        "//src/core:error_utils",
+        "//src/core:iomgr_fwd",
+        "//src/core:iomgr_port",
+        "//src/core:metadata_batch",
+        "//src/core:notification",
+        "//src/core:slice",
+        "//src/core:slice_refcount",
+        "//src/core:status_helper",
+        "//src/core:subchannel_connector",
+        "//src/core:transport_fwd",
+    ],
+)
+
 grpc_cc_library(
     name = "grpc++_xds_client",
     srcs = [
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 113eb420a38..41e69b70ab7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -962,6 +962,9 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx bin_decoder_test)
   add_dependencies(buildtests_cxx bin_encoder_test)
   add_dependencies(buildtests_cxx binary_metadata_test)
+  add_dependencies(buildtests_cxx binder_resolver_test)
+  add_dependencies(buildtests_cxx binder_server_test)
+  add_dependencies(buildtests_cxx binder_transport_test)
   add_dependencies(buildtests_cxx bitset_test)
   add_dependencies(buildtests_cxx blackboard_test)
   add_dependencies(buildtests_cxx buffer_list_test)
@@ -1077,8 +1080,12 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx dump_args_test)
   add_dependencies(buildtests_cxx duplicate_header_bad_client_test)
   add_dependencies(buildtests_cxx empty_batch_test)
+  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
+    add_dependencies(buildtests_cxx end2end_binder_transport_test)
+  endif()
   add_dependencies(buildtests_cxx end2end_test)
   add_dependencies(buildtests_cxx endpoint_addresses_test)
+  add_dependencies(buildtests_cxx endpoint_binder_pool_test)
   add_dependencies(buildtests_cxx endpoint_config_test)
   add_dependencies(buildtests_cxx endpoint_pair_test)
   add_dependencies(buildtests_cxx env_test)
@@ -1098,6 +1105,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx experiments_tag_test)
   add_dependencies(buildtests_cxx experiments_test)
   add_dependencies(buildtests_cxx factory_test)
+  add_dependencies(buildtests_cxx fake_binder_test)
   add_dependencies(buildtests_cxx fake_resolver_test)
   add_dependencies(buildtests_cxx fake_transport_security_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
@@ -1529,6 +1537,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx trailing_metadata_test)
   add_dependencies(buildtests_cxx transport_security_common_api_test)
   add_dependencies(buildtests_cxx transport_security_test)
+  add_dependencies(buildtests_cxx transport_stream_receiver_test)
   add_dependencies(buildtests_cxx try_join_test)
   add_dependencies(buildtests_cxx try_seq_metadata_test)
   add_dependencies(buildtests_cxx try_seq_test)
@@ -1553,6 +1562,8 @@ if(gRPC_BUILD_TESTS)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS)
     add_dependencies(buildtests_cxx windows_endpoint_test)
   endif()
+  add_dependencies(buildtests_cxx wire_reader_test)
+  add_dependencies(buildtests_cxx wire_writer_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx work_serializer_test)
   endif()
@@ -2536,6 +2547,7 @@ add_library(grpc
   src/core/load_balancing/xds/xds_wrr_locality.cc
   src/core/plugin_registry/grpc_plugin_registry.cc
   src/core/plugin_registry/grpc_plugin_registry_extra.cc
+  src/core/resolver/binder/binder_resolver.cc
   src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3302,6 +3314,7 @@ add_library(grpc_unsecure
   src/core/load_balancing/weighted_target/weighted_target.cc
   src/core/plugin_registry/grpc_plugin_registry.cc
   src/core/plugin_registry/grpc_plugin_registry_noextra.cc
+  src/core/resolver/binder/binder_resolver.cc
   src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -4175,6 +4188,24 @@ endif()
 endif()
 
 add_library(grpc++
+  src/core/ext/transport/binder/client/binder_connector.cc
+  src/core/ext/transport/binder/client/channel_create.cc
+  src/core/ext/transport/binder/client/channel_create_impl.cc
+  src/core/ext/transport/binder/client/connection_id_generator.cc
+  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  src/core/ext/transport/binder/client/jni_utils.cc
+  src/core/ext/transport/binder/client/security_policy_setting.cc
+  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  src/core/ext/transport/binder/server/binder_server.cc
+  src/core/ext/transport/binder/server/binder_server_credentials.cc
+  src/core/ext/transport/binder/transport/binder_transport.cc
+  src/core/ext/transport/binder/utils/ndk_binder.cc
+  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  src/core/ext/transport/binder/wire_format/binder_android.cc
+  src/core/ext/transport/binder/wire_format/binder_constants.cc
+  src/core/ext/transport/binder/wire_format/transaction.cc
+  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  src/core/ext/transport/binder/wire_format/wire_writer.cc
   src/cpp/client/call_credentials.cc
   src/cpp/client/channel_cc.cc
   src/cpp/client/channel_credentials.cc
@@ -4356,6 +4387,7 @@ foreach(_hdr
   include/grpcpp/client_context.h
   include/grpcpp/completion_queue.h
   include/grpcpp/create_channel.h
+  include/grpcpp/create_channel_binder.h
   include/grpcpp/create_channel_posix.h
   include/grpcpp/ext/call_metric_recorder.h
   include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -4447,6 +4479,8 @@ foreach(_hdr
   include/grpcpp/security/auth_context.h
   include/grpcpp/security/auth_metadata_processor.h
   include/grpcpp/security/authorization_policy_provider.h
+  include/grpcpp/security/binder_credentials.h
+  include/grpcpp/security/binder_security_policy.h
   include/grpcpp/security/credentials.h
   include/grpcpp/security/server_credentials.h
   include/grpcpp/security/tls_certificate_provider.h
@@ -8136,6 +8170,220 @@ target_link_libraries(binary_metadata_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(binder_resolver_test
+  test/core/resolver/binder_resolver_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(binder_resolver_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(binder_resolver_test PUBLIC cxx_std_14)
+target_include_directories(binder_resolver_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(binder_resolver_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  grpc_test_util
+)
+
+
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(binder_server_test
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
+  test/core/transport/binder/end2end/binder_server_test.cc
+  test/core/transport/binder/end2end/fake_binder.cc
+  test/cpp/end2end/test_service_impl.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(binder_server_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+      "GRPCXX_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(binder_server_test PUBLIC cxx_std_14)
+target_include_directories(binder_server_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(binder_server_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  grpc++_test_util
+)
+
+
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(binder_transport_test
+  src/core/ext/transport/binder/client/binder_connector.cc
+  src/core/ext/transport/binder/client/channel_create.cc
+  src/core/ext/transport/binder/client/channel_create_impl.cc
+  src/core/ext/transport/binder/client/connection_id_generator.cc
+  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  src/core/ext/transport/binder/client/jni_utils.cc
+  src/core/ext/transport/binder/client/security_policy_setting.cc
+  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  src/core/ext/transport/binder/server/binder_server.cc
+  src/core/ext/transport/binder/server/binder_server_credentials.cc
+  src/core/ext/transport/binder/transport/binder_transport.cc
+  src/core/ext/transport/binder/utils/ndk_binder.cc
+  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  src/core/ext/transport/binder/wire_format/binder_android.cc
+  src/core/ext/transport/binder/wire_format/binder_constants.cc
+  src/core/ext/transport/binder/wire_format/transaction.cc
+  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  src/core/ext/transport/binder/wire_format/wire_writer.cc
+  src/cpp/client/call_credentials.cc
+  src/cpp/client/channel_cc.cc
+  src/cpp/client/channel_credentials.cc
+  src/cpp/client/client_callback.cc
+  src/cpp/client/client_context.cc
+  src/cpp/client/client_interceptor.cc
+  src/cpp/client/client_stats_interceptor.cc
+  src/cpp/client/create_channel.cc
+  src/cpp/client/create_channel_internal.cc
+  src/cpp/client/create_channel_posix.cc
+  src/cpp/client/global_callback_hook.cc
+  src/cpp/client/insecure_credentials.cc
+  src/cpp/client/secure_credentials.cc
+  src/cpp/common/alarm.cc
+  src/cpp/common/auth_property_iterator.cc
+  src/cpp/common/channel_arguments.cc
+  src/cpp/common/completion_queue_cc.cc
+  src/cpp/common/resource_quota_cc.cc
+  src/cpp/common/rpc_method.cc
+  src/cpp/common/secure_auth_context.cc
+  src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_certificate_provider.cc
+  src/cpp/common/tls_certificate_verifier.cc
+  src/cpp/common/tls_credentials_options.cc
+  src/cpp/common/validate_service_config.cc
+  src/cpp/common/version_cc.cc
+  src/cpp/server/async_generic_service.cc
+  src/cpp/server/backend_metric_recorder.cc
+  src/cpp/server/channel_argument_option.cc
+  src/cpp/server/create_default_thread_pool.cc
+  src/cpp/server/external_connection_acceptor_impl.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
+  src/cpp/server/insecure_server_credentials.cc
+  src/cpp/server/secure_server_credentials.cc
+  src/cpp/server/server_builder.cc
+  src/cpp/server/server_callback.cc
+  src/cpp/server/server_cc.cc
+  src/cpp/server/server_context.cc
+  src/cpp/server/server_credentials.cc
+  src/cpp/server/server_posix.cc
+  src/cpp/thread_manager/thread_manager.cc
+  src/cpp/util/byte_buffer_cc.cc
+  src/cpp/util/status.cc
+  src/cpp/util/string_ref.cc
+  src/cpp/util/time_cc.cc
+  test/core/transport/binder/binder_transport_test.cc
+  test/core/transport/binder/mock_objects.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(binder_transport_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(binder_transport_test PUBLIC cxx_std_14)
+target_include_directories(binder_transport_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(binder_transport_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::absl_check
+  absl::absl_log
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -13052,6 +13300,70 @@ target_link_libraries(empty_batch_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
+
+  add_executable(end2end_binder_transport_test
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
+    test/core/transport/binder/end2end/end2end_binder_transport_test.cc
+    test/core/transport/binder/end2end/fake_binder.cc
+    test/core/transport/binder/end2end/testing_channel_create.cc
+    test/cpp/end2end/test_service_impl.cc
+  )
+  if(WIN32 AND MSVC)
+    if(BUILD_SHARED_LIBS)
+      target_compile_definitions(end2end_binder_transport_test
+      PRIVATE
+        "GPR_DLL_IMPORTS"
+        "GRPC_DLL_IMPORTS"
+        "GRPCXX_DLL_IMPORTS"
+      )
+    endif()
+  endif()
+  target_compile_features(end2end_binder_transport_test PUBLIC cxx_std_14)
+  target_include_directories(end2end_binder_transport_test
+    PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/include
+      ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+      ${_gRPC_RE2_INCLUDE_DIR}
+      ${_gRPC_SSL_INCLUDE_DIR}
+      ${_gRPC_UPB_GENERATED_DIR}
+      ${_gRPC_UPB_GRPC_GENERATED_DIR}
+      ${_gRPC_UPB_INCLUDE_DIR}
+      ${_gRPC_XXHASH_INCLUDE_DIR}
+      ${_gRPC_ZLIB_INCLUDE_DIR}
+      third_party/googletest/googletest/include
+      third_party/googletest/googletest
+      third_party/googletest/googlemock/include
+      third_party/googletest/googlemock
+      ${_gRPC_PROTO_GENS_DIR}
+  )
+
+  target_link_libraries(end2end_binder_transport_test
+    ${_gRPC_ALLTARGETS_LIBRARIES}
+    gtest
+    grpc++_test_util
+  )
+
+
+endif()
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -13162,28 +13474,139 @@ target_link_libraries(endpoint_addresses_test
 endif()
 if(gRPC_BUILD_TESTS)
 
-add_executable(endpoint_config_test
-  src/core/lib/channel/channel_args.cc
-  src/core/lib/event_engine/channel_args_endpoint_config.cc
-  src/core/lib/surface/channel_stack_type.cc
-  src/core/util/ref_counted_string.cc
-  src/core/util/time.cc
-  test/core/event_engine/endpoint_config_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(endpoint_config_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(endpoint_config_test PUBLIC cxx_std_14)
-target_include_directories(endpoint_config_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+add_executable(endpoint_binder_pool_test
+  src/core/ext/transport/binder/client/binder_connector.cc
+  src/core/ext/transport/binder/client/channel_create.cc
+  src/core/ext/transport/binder/client/channel_create_impl.cc
+  src/core/ext/transport/binder/client/connection_id_generator.cc
+  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  src/core/ext/transport/binder/client/jni_utils.cc
+  src/core/ext/transport/binder/client/security_policy_setting.cc
+  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  src/core/ext/transport/binder/server/binder_server.cc
+  src/core/ext/transport/binder/server/binder_server_credentials.cc
+  src/core/ext/transport/binder/transport/binder_transport.cc
+  src/core/ext/transport/binder/utils/ndk_binder.cc
+  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  src/core/ext/transport/binder/wire_format/binder_android.cc
+  src/core/ext/transport/binder/wire_format/binder_constants.cc
+  src/core/ext/transport/binder/wire_format/transaction.cc
+  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  src/core/ext/transport/binder/wire_format/wire_writer.cc
+  src/cpp/client/call_credentials.cc
+  src/cpp/client/channel_cc.cc
+  src/cpp/client/channel_credentials.cc
+  src/cpp/client/client_callback.cc
+  src/cpp/client/client_context.cc
+  src/cpp/client/client_interceptor.cc
+  src/cpp/client/client_stats_interceptor.cc
+  src/cpp/client/create_channel.cc
+  src/cpp/client/create_channel_internal.cc
+  src/cpp/client/create_channel_posix.cc
+  src/cpp/client/global_callback_hook.cc
+  src/cpp/client/insecure_credentials.cc
+  src/cpp/client/secure_credentials.cc
+  src/cpp/common/alarm.cc
+  src/cpp/common/auth_property_iterator.cc
+  src/cpp/common/channel_arguments.cc
+  src/cpp/common/completion_queue_cc.cc
+  src/cpp/common/resource_quota_cc.cc
+  src/cpp/common/rpc_method.cc
+  src/cpp/common/secure_auth_context.cc
+  src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_certificate_provider.cc
+  src/cpp/common/tls_certificate_verifier.cc
+  src/cpp/common/tls_credentials_options.cc
+  src/cpp/common/validate_service_config.cc
+  src/cpp/common/version_cc.cc
+  src/cpp/server/async_generic_service.cc
+  src/cpp/server/backend_metric_recorder.cc
+  src/cpp/server/channel_argument_option.cc
+  src/cpp/server/create_default_thread_pool.cc
+  src/cpp/server/external_connection_acceptor_impl.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
+  src/cpp/server/insecure_server_credentials.cc
+  src/cpp/server/secure_server_credentials.cc
+  src/cpp/server/server_builder.cc
+  src/cpp/server/server_callback.cc
+  src/cpp/server/server_cc.cc
+  src/cpp/server/server_context.cc
+  src/cpp/server/server_credentials.cc
+  src/cpp/server/server_posix.cc
+  src/cpp/thread_manager/thread_manager.cc
+  src/cpp/util/byte_buffer_cc.cc
+  src/cpp/util/status.cc
+  src/cpp/util/string_ref.cc
+  src/cpp/util/time_cc.cc
+  test/core/transport/binder/endpoint_binder_pool_test.cc
+  test/core/transport/binder/mock_objects.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(endpoint_binder_pool_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(endpoint_binder_pool_test PUBLIC cxx_std_14)
+target_include_directories(endpoint_binder_pool_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(endpoint_binder_pool_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::absl_check
+  absl::absl_log
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(endpoint_config_test
+  src/core/lib/channel/channel_args.cc
+  src/core/lib/event_engine/channel_args_endpoint_config.cc
+  src/core/lib/surface/channel_stack_type.cc
+  src/core/util/ref_counted_string.cc
+  src/core/util/time.cc
+  test/core/event_engine/endpoint_config_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(endpoint_config_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(endpoint_config_test PUBLIC cxx_std_14)
+target_include_directories(endpoint_config_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
     ${_gRPC_RE2_INCLUDE_DIR}
     ${_gRPC_SSL_INCLUDE_DIR}
     ${_gRPC_UPB_GENERATED_DIR}
@@ -13904,6 +14327,117 @@ target_link_libraries(factory_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(fake_binder_test
+  src/core/ext/transport/binder/client/binder_connector.cc
+  src/core/ext/transport/binder/client/channel_create.cc
+  src/core/ext/transport/binder/client/channel_create_impl.cc
+  src/core/ext/transport/binder/client/connection_id_generator.cc
+  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  src/core/ext/transport/binder/client/jni_utils.cc
+  src/core/ext/transport/binder/client/security_policy_setting.cc
+  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  src/core/ext/transport/binder/server/binder_server.cc
+  src/core/ext/transport/binder/server/binder_server_credentials.cc
+  src/core/ext/transport/binder/transport/binder_transport.cc
+  src/core/ext/transport/binder/utils/ndk_binder.cc
+  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  src/core/ext/transport/binder/wire_format/binder_android.cc
+  src/core/ext/transport/binder/wire_format/binder_constants.cc
+  src/core/ext/transport/binder/wire_format/transaction.cc
+  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  src/core/ext/transport/binder/wire_format/wire_writer.cc
+  src/cpp/client/call_credentials.cc
+  src/cpp/client/channel_cc.cc
+  src/cpp/client/channel_credentials.cc
+  src/cpp/client/client_callback.cc
+  src/cpp/client/client_context.cc
+  src/cpp/client/client_interceptor.cc
+  src/cpp/client/client_stats_interceptor.cc
+  src/cpp/client/create_channel.cc
+  src/cpp/client/create_channel_internal.cc
+  src/cpp/client/create_channel_posix.cc
+  src/cpp/client/global_callback_hook.cc
+  src/cpp/client/insecure_credentials.cc
+  src/cpp/client/secure_credentials.cc
+  src/cpp/common/alarm.cc
+  src/cpp/common/auth_property_iterator.cc
+  src/cpp/common/channel_arguments.cc
+  src/cpp/common/completion_queue_cc.cc
+  src/cpp/common/resource_quota_cc.cc
+  src/cpp/common/rpc_method.cc
+  src/cpp/common/secure_auth_context.cc
+  src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_certificate_provider.cc
+  src/cpp/common/tls_certificate_verifier.cc
+  src/cpp/common/tls_credentials_options.cc
+  src/cpp/common/validate_service_config.cc
+  src/cpp/common/version_cc.cc
+  src/cpp/server/async_generic_service.cc
+  src/cpp/server/backend_metric_recorder.cc
+  src/cpp/server/channel_argument_option.cc
+  src/cpp/server/create_default_thread_pool.cc
+  src/cpp/server/external_connection_acceptor_impl.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
+  src/cpp/server/insecure_server_credentials.cc
+  src/cpp/server/secure_server_credentials.cc
+  src/cpp/server/server_builder.cc
+  src/cpp/server/server_callback.cc
+  src/cpp/server/server_cc.cc
+  src/cpp/server/server_context.cc
+  src/cpp/server/server_credentials.cc
+  src/cpp/server/server_posix.cc
+  src/cpp/thread_manager/thread_manager.cc
+  src/cpp/util/byte_buffer_cc.cc
+  src/cpp/util/status.cc
+  src/cpp/util/string_ref.cc
+  src/cpp/util/time_cc.cc
+  test/core/transport/binder/end2end/fake_binder.cc
+  test/core/transport/binder/end2end/fake_binder_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(fake_binder_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(fake_binder_test PUBLIC cxx_std_14)
+target_include_directories(fake_binder_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(fake_binder_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::absl_check
+  absl::absl_log
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -32048,6 +32582,116 @@ target_link_libraries(transport_security_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(transport_stream_receiver_test
+  src/core/ext/transport/binder/client/binder_connector.cc
+  src/core/ext/transport/binder/client/channel_create.cc
+  src/core/ext/transport/binder/client/channel_create_impl.cc
+  src/core/ext/transport/binder/client/connection_id_generator.cc
+  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  src/core/ext/transport/binder/client/jni_utils.cc
+  src/core/ext/transport/binder/client/security_policy_setting.cc
+  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  src/core/ext/transport/binder/server/binder_server.cc
+  src/core/ext/transport/binder/server/binder_server_credentials.cc
+  src/core/ext/transport/binder/transport/binder_transport.cc
+  src/core/ext/transport/binder/utils/ndk_binder.cc
+  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  src/core/ext/transport/binder/wire_format/binder_android.cc
+  src/core/ext/transport/binder/wire_format/binder_constants.cc
+  src/core/ext/transport/binder/wire_format/transaction.cc
+  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  src/core/ext/transport/binder/wire_format/wire_writer.cc
+  src/cpp/client/call_credentials.cc
+  src/cpp/client/channel_cc.cc
+  src/cpp/client/channel_credentials.cc
+  src/cpp/client/client_callback.cc
+  src/cpp/client/client_context.cc
+  src/cpp/client/client_interceptor.cc
+  src/cpp/client/client_stats_interceptor.cc
+  src/cpp/client/create_channel.cc
+  src/cpp/client/create_channel_internal.cc
+  src/cpp/client/create_channel_posix.cc
+  src/cpp/client/global_callback_hook.cc
+  src/cpp/client/insecure_credentials.cc
+  src/cpp/client/secure_credentials.cc
+  src/cpp/common/alarm.cc
+  src/cpp/common/auth_property_iterator.cc
+  src/cpp/common/channel_arguments.cc
+  src/cpp/common/completion_queue_cc.cc
+  src/cpp/common/resource_quota_cc.cc
+  src/cpp/common/rpc_method.cc
+  src/cpp/common/secure_auth_context.cc
+  src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_certificate_provider.cc
+  src/cpp/common/tls_certificate_verifier.cc
+  src/cpp/common/tls_credentials_options.cc
+  src/cpp/common/validate_service_config.cc
+  src/cpp/common/version_cc.cc
+  src/cpp/server/async_generic_service.cc
+  src/cpp/server/backend_metric_recorder.cc
+  src/cpp/server/channel_argument_option.cc
+  src/cpp/server/create_default_thread_pool.cc
+  src/cpp/server/external_connection_acceptor_impl.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
+  src/cpp/server/insecure_server_credentials.cc
+  src/cpp/server/secure_server_credentials.cc
+  src/cpp/server/server_builder.cc
+  src/cpp/server/server_callback.cc
+  src/cpp/server/server_cc.cc
+  src/cpp/server/server_context.cc
+  src/cpp/server/server_credentials.cc
+  src/cpp/server/server_posix.cc
+  src/cpp/thread_manager/thread_manager.cc
+  src/cpp/util/byte_buffer_cc.cc
+  src/cpp/util/status.cc
+  src/cpp/util/string_ref.cc
+  src/cpp/util/time_cc.cc
+  test/core/transport/binder/transport_stream_receiver_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(transport_stream_receiver_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(transport_stream_receiver_test PUBLIC cxx_std_14)
+target_include_directories(transport_stream_receiver_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(transport_stream_receiver_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::absl_check
+  absl::absl_log
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -32825,6 +33469,228 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS)
 
 
 endif()
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(wire_reader_test
+  src/core/ext/transport/binder/client/binder_connector.cc
+  src/core/ext/transport/binder/client/channel_create.cc
+  src/core/ext/transport/binder/client/channel_create_impl.cc
+  src/core/ext/transport/binder/client/connection_id_generator.cc
+  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  src/core/ext/transport/binder/client/jni_utils.cc
+  src/core/ext/transport/binder/client/security_policy_setting.cc
+  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  src/core/ext/transport/binder/server/binder_server.cc
+  src/core/ext/transport/binder/server/binder_server_credentials.cc
+  src/core/ext/transport/binder/transport/binder_transport.cc
+  src/core/ext/transport/binder/utils/ndk_binder.cc
+  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  src/core/ext/transport/binder/wire_format/binder_android.cc
+  src/core/ext/transport/binder/wire_format/binder_constants.cc
+  src/core/ext/transport/binder/wire_format/transaction.cc
+  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  src/core/ext/transport/binder/wire_format/wire_writer.cc
+  src/cpp/client/call_credentials.cc
+  src/cpp/client/channel_cc.cc
+  src/cpp/client/channel_credentials.cc
+  src/cpp/client/client_callback.cc
+  src/cpp/client/client_context.cc
+  src/cpp/client/client_interceptor.cc
+  src/cpp/client/client_stats_interceptor.cc
+  src/cpp/client/create_channel.cc
+  src/cpp/client/create_channel_internal.cc
+  src/cpp/client/create_channel_posix.cc
+  src/cpp/client/global_callback_hook.cc
+  src/cpp/client/insecure_credentials.cc
+  src/cpp/client/secure_credentials.cc
+  src/cpp/common/alarm.cc
+  src/cpp/common/auth_property_iterator.cc
+  src/cpp/common/channel_arguments.cc
+  src/cpp/common/completion_queue_cc.cc
+  src/cpp/common/resource_quota_cc.cc
+  src/cpp/common/rpc_method.cc
+  src/cpp/common/secure_auth_context.cc
+  src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_certificate_provider.cc
+  src/cpp/common/tls_certificate_verifier.cc
+  src/cpp/common/tls_credentials_options.cc
+  src/cpp/common/validate_service_config.cc
+  src/cpp/common/version_cc.cc
+  src/cpp/server/async_generic_service.cc
+  src/cpp/server/backend_metric_recorder.cc
+  src/cpp/server/channel_argument_option.cc
+  src/cpp/server/create_default_thread_pool.cc
+  src/cpp/server/external_connection_acceptor_impl.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
+  src/cpp/server/insecure_server_credentials.cc
+  src/cpp/server/secure_server_credentials.cc
+  src/cpp/server/server_builder.cc
+  src/cpp/server/server_callback.cc
+  src/cpp/server/server_cc.cc
+  src/cpp/server/server_context.cc
+  src/cpp/server/server_credentials.cc
+  src/cpp/server/server_posix.cc
+  src/cpp/thread_manager/thread_manager.cc
+  src/cpp/util/byte_buffer_cc.cc
+  src/cpp/util/status.cc
+  src/cpp/util/string_ref.cc
+  src/cpp/util/time_cc.cc
+  test/core/transport/binder/mock_objects.cc
+  test/core/transport/binder/wire_reader_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(wire_reader_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(wire_reader_test PUBLIC cxx_std_14)
+target_include_directories(wire_reader_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(wire_reader_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::absl_check
+  absl::absl_log
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(wire_writer_test
+  src/core/ext/transport/binder/client/binder_connector.cc
+  src/core/ext/transport/binder/client/channel_create.cc
+  src/core/ext/transport/binder/client/channel_create_impl.cc
+  src/core/ext/transport/binder/client/connection_id_generator.cc
+  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  src/core/ext/transport/binder/client/jni_utils.cc
+  src/core/ext/transport/binder/client/security_policy_setting.cc
+  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  src/core/ext/transport/binder/server/binder_server.cc
+  src/core/ext/transport/binder/server/binder_server_credentials.cc
+  src/core/ext/transport/binder/transport/binder_transport.cc
+  src/core/ext/transport/binder/utils/ndk_binder.cc
+  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  src/core/ext/transport/binder/wire_format/binder_android.cc
+  src/core/ext/transport/binder/wire_format/binder_constants.cc
+  src/core/ext/transport/binder/wire_format/transaction.cc
+  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  src/core/ext/transport/binder/wire_format/wire_writer.cc
+  src/cpp/client/call_credentials.cc
+  src/cpp/client/channel_cc.cc
+  src/cpp/client/channel_credentials.cc
+  src/cpp/client/client_callback.cc
+  src/cpp/client/client_context.cc
+  src/cpp/client/client_interceptor.cc
+  src/cpp/client/client_stats_interceptor.cc
+  src/cpp/client/create_channel.cc
+  src/cpp/client/create_channel_internal.cc
+  src/cpp/client/create_channel_posix.cc
+  src/cpp/client/global_callback_hook.cc
+  src/cpp/client/insecure_credentials.cc
+  src/cpp/client/secure_credentials.cc
+  src/cpp/common/alarm.cc
+  src/cpp/common/auth_property_iterator.cc
+  src/cpp/common/channel_arguments.cc
+  src/cpp/common/completion_queue_cc.cc
+  src/cpp/common/resource_quota_cc.cc
+  src/cpp/common/rpc_method.cc
+  src/cpp/common/secure_auth_context.cc
+  src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_certificate_provider.cc
+  src/cpp/common/tls_certificate_verifier.cc
+  src/cpp/common/tls_credentials_options.cc
+  src/cpp/common/validate_service_config.cc
+  src/cpp/common/version_cc.cc
+  src/cpp/server/async_generic_service.cc
+  src/cpp/server/backend_metric_recorder.cc
+  src/cpp/server/channel_argument_option.cc
+  src/cpp/server/create_default_thread_pool.cc
+  src/cpp/server/external_connection_acceptor_impl.cc
+  src/cpp/server/health/default_health_check_service.cc
+  src/cpp/server/health/health_check_service.cc
+  src/cpp/server/health/health_check_service_server_builder_option.cc
+  src/cpp/server/insecure_server_credentials.cc
+  src/cpp/server/secure_server_credentials.cc
+  src/cpp/server/server_builder.cc
+  src/cpp/server/server_callback.cc
+  src/cpp/server/server_cc.cc
+  src/cpp/server/server_context.cc
+  src/cpp/server/server_credentials.cc
+  src/cpp/server/server_posix.cc
+  src/cpp/thread_manager/thread_manager.cc
+  src/cpp/util/byte_buffer_cc.cc
+  src/cpp/util/status.cc
+  src/cpp/util/string_ref.cc
+  src/cpp/util/time_cc.cc
+  test/core/transport/binder/mock_objects.cc
+  test/core/transport/binder/wire_writer_test.cc
+)
+if(WIN32 AND MSVC)
+  if(BUILD_SHARED_LIBS)
+    target_compile_definitions(wire_writer_test
+    PRIVATE
+      "GPR_DLL_IMPORTS"
+      "GRPC_DLL_IMPORTS"
+    )
+  endif()
+endif()
+target_compile_features(wire_writer_test PUBLIC cxx_std_14)
+target_include_directories(wire_writer_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(wire_writer_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::absl_check
+  absl::absl_log
+  ${_gRPC_PROTOBUF_LIBRARIES}
+  grpc_test_util
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
diff --git a/Makefile b/Makefile
index 063659c0cfb..b33a29370b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1355,6 +1355,7 @@ LIBGRPC_SRC = \
     src/core/load_balancing/xds/xds_wrr_locality.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
+    src/core/resolver/binder/binder_resolver.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
diff --git a/Package.swift b/Package.swift
index bfda2eef090..f1e60c511ca 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1702,6 +1702,7 @@ let package = Package(
         "src/core/load_balancing/xds/xds_wrr_locality.cc",
         "src/core/plugin_registry/grpc_plugin_registry.cc",
         "src/core/plugin_registry/grpc_plugin_registry_extra.cc",
+        "src/core/resolver/binder/binder_resolver.cc",
         "src/core/resolver/dns/c_ares/dns_resolver_ares.cc",
         "src/core/resolver/dns/c_ares/dns_resolver_ares.h",
         "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h",
diff --git a/WORKSPACE b/WORKSPACE
index f3188fcaeaf..675233b2eb1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -56,6 +56,16 @@ android_ndk_repository(name = "androidndk")
 # here, because the toolchain rule fails when $ANDROID_NDK_HOME is not set.
 # Use `--extra_toolchains=@androidndk//:all` to manually register it when building for Android.
 
+# Prevents bazel's '...' expansion from including the following folder.
+# This is required because the BUILD file in the following folder
+# will trigger bazel failure when Android SDK is not configured.
+# The targets in the following folder need to be included in APK and will
+# be invoked by binder transport implementation through JNI.
+local_repository(
+    name = "binder_transport_android_helper",
+    path = "src/core/ext/transport/binder/java",
+)
+
 # Prevents bazel's '...' expansion from including the following folder.
 # This is required to avoid triggering "Unable to find package for @rules_fuzzing//fuzzing:cc_defs.bzl"
 # error.
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 0df78d48a7a..3ae9dd5577c 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -1958,6 +1958,7 @@ libs:
   - src/core/load_balancing/xds/xds_wrr_locality.cc
   - src/core/plugin_registry/grpc_plugin_registry.cc
   - src/core/plugin_registry/grpc_plugin_registry_extra.cc
+  - src/core/resolver/binder/binder_resolver.cc
   - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3076,6 +3077,7 @@ libs:
   - src/core/load_balancing/weighted_target/weighted_target.cc
   - src/core/plugin_registry/grpc_plugin_registry.cc
   - src/core/plugin_registry/grpc_plugin_registry_noextra.cc
+  - src/core/resolver/binder/binder_resolver.cc
   - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3761,6 +3763,7 @@ libs:
   - include/grpcpp/client_context.h
   - include/grpcpp/completion_queue.h
   - include/grpcpp/create_channel.h
+  - include/grpcpp/create_channel_binder.h
   - include/grpcpp/create_channel_posix.h
   - include/grpcpp/ext/call_metric_recorder.h
   - include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -3852,6 +3855,8 @@ libs:
   - include/grpcpp/security/auth_context.h
   - include/grpcpp/security/auth_metadata_processor.h
   - include/grpcpp/security/authorization_policy_provider.h
+  - include/grpcpp/security/binder_credentials.h
+  - include/grpcpp/security/binder_security_policy.h
   - include/grpcpp/security/credentials.h
   - include/grpcpp/security/server_credentials.h
   - include/grpcpp/security/tls_certificate_provider.h
@@ -3890,6 +3895,26 @@ libs:
   - include/grpcpp/version_info.h
   - include/grpcpp/xds_server_builder.h
   headers:
+  - src/core/ext/transport/binder/client/binder_connector.h
+  - src/core/ext/transport/binder/client/channel_create_impl.h
+  - src/core/ext/transport/binder/client/connection_id_generator.h
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
+  - src/core/ext/transport/binder/client/jni_utils.h
+  - src/core/ext/transport/binder/client/security_policy_setting.h
+  - src/core/ext/transport/binder/server/binder_server.h
+  - src/core/ext/transport/binder/transport/binder_stream.h
+  - src/core/ext/transport/binder/transport/binder_transport.h
+  - src/core/ext/transport/binder/utils/binder_auto_utils.h
+  - src/core/ext/transport/binder/utils/ndk_binder.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+  - src/core/ext/transport/binder/wire_format/binder.h
+  - src/core/ext/transport/binder/wire_format/binder_android.h
+  - src/core/ext/transport/binder/wire_format/binder_constants.h
+  - src/core/ext/transport/binder/wire_format/transaction.h
+  - src/core/ext/transport/binder/wire_format/wire_reader.h
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+  - src/core/ext/transport/binder/wire_format/wire_writer.h
   - src/core/xds/grpc/xds_enabled_server.h
   - src/cpp/client/client_stats_interceptor.h
   - src/cpp/client/create_channel_internal.h
@@ -3903,6 +3928,24 @@ libs:
   - src/cpp/server/thread_pool_interface.h
   - src/cpp/thread_manager/thread_manager.h
   src:
+  - src/core/ext/transport/binder/client/binder_connector.cc
+  - src/core/ext/transport/binder/client/channel_create.cc
+  - src/core/ext/transport/binder/client/channel_create_impl.cc
+  - src/core/ext/transport/binder/client/connection_id_generator.cc
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  - src/core/ext/transport/binder/client/jni_utils.cc
+  - src/core/ext/transport/binder/client/security_policy_setting.cc
+  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  - src/core/ext/transport/binder/server/binder_server.cc
+  - src/core/ext/transport/binder/server/binder_server_credentials.cc
+  - src/core/ext/transport/binder/transport/binder_transport.cc
+  - src/core/ext/transport/binder/utils/ndk_binder.cc
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  - src/core/ext/transport/binder/wire_format/binder_android.cc
+  - src/core/ext/transport/binder/wire_format/binder_constants.cc
+  - src/core/ext/transport/binder/wire_format/transaction.cc
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  - src/core/ext/transport/binder/wire_format/wire_writer.cc
   - src/cpp/client/call_credentials.cc
   - src/cpp/client/channel_cc.cc
   - src/cpp/client/channel_credentials.cc
@@ -6091,6 +6134,146 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
+- name: binder_resolver_test
+  gtest: true
+  build: test
+  language: c++
+  headers: []
+  src:
+  - test/core/resolver/binder_resolver_test.cc
+  deps:
+  - gtest
+  - grpc_test_util
+- name: binder_server_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - test/core/transport/binder/end2end/fake_binder.h
+  - test/cpp/end2end/test_service_impl.h
+  src:
+  - src/proto/grpc/testing/echo.proto
+  - src/proto/grpc/testing/echo_messages.proto
+  - src/proto/grpc/testing/simple_messages.proto
+  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
+  - test/core/transport/binder/end2end/binder_server_test.cc
+  - test/core/transport/binder/end2end/fake_binder.cc
+  - test/cpp/end2end/test_service_impl.cc
+  deps:
+  - gtest
+  - grpc++_test_util
+- name: binder_transport_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/transport/binder/client/binder_connector.h
+  - src/core/ext/transport/binder/client/channel_create_impl.h
+  - src/core/ext/transport/binder/client/connection_id_generator.h
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
+  - src/core/ext/transport/binder/client/jni_utils.h
+  - src/core/ext/transport/binder/client/security_policy_setting.h
+  - src/core/ext/transport/binder/server/binder_server.h
+  - src/core/ext/transport/binder/transport/binder_stream.h
+  - src/core/ext/transport/binder/transport/binder_transport.h
+  - src/core/ext/transport/binder/utils/binder_auto_utils.h
+  - src/core/ext/transport/binder/utils/ndk_binder.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+  - src/core/ext/transport/binder/wire_format/binder.h
+  - src/core/ext/transport/binder/wire_format/binder_android.h
+  - src/core/ext/transport/binder/wire_format/binder_constants.h
+  - src/core/ext/transport/binder/wire_format/transaction.h
+  - src/core/ext/transport/binder/wire_format/wire_reader.h
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+  - src/core/ext/transport/binder/wire_format/wire_writer.h
+  - src/cpp/client/client_stats_interceptor.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/client/secure_credentials.h
+  - src/cpp/common/secure_auth_context.h
+  - src/cpp/server/backend_metric_recorder.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/secure_server_credentials.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
+  - test/core/transport/binder/mock_objects.h
+  src:
+  - src/core/ext/transport/binder/client/binder_connector.cc
+  - src/core/ext/transport/binder/client/channel_create.cc
+  - src/core/ext/transport/binder/client/channel_create_impl.cc
+  - src/core/ext/transport/binder/client/connection_id_generator.cc
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  - src/core/ext/transport/binder/client/jni_utils.cc
+  - src/core/ext/transport/binder/client/security_policy_setting.cc
+  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  - src/core/ext/transport/binder/server/binder_server.cc
+  - src/core/ext/transport/binder/server/binder_server_credentials.cc
+  - src/core/ext/transport/binder/transport/binder_transport.cc
+  - src/core/ext/transport/binder/utils/ndk_binder.cc
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  - src/core/ext/transport/binder/wire_format/binder_android.cc
+  - src/core/ext/transport/binder/wire_format/binder_constants.cc
+  - src/core/ext/transport/binder/wire_format/transaction.cc
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  - src/core/ext/transport/binder/wire_format/wire_writer.cc
+  - src/cpp/client/call_credentials.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/channel_credentials.cc
+  - src/cpp/client/client_callback.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/client_stats_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/global_callback_hook.cc
+  - src/cpp/client/insecure_credentials.cc
+  - src/cpp/client/secure_credentials.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/secure_auth_context.cc
+  - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
+  - src/cpp/common/tls_certificate_verifier.cc
+  - src/cpp/common/tls_credentials_options.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/backend_metric_recorder.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/insecure_server_credentials.cc
+  - src/cpp/server/secure_server_credentials.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_callback.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
+  - test/core/transport/binder/binder_transport_test.cc
+  - test/core/transport/binder/mock_objects.cc
+  deps:
+  - gtest
+  - absl/log:absl_check
+  - absl/log:absl_log
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
 - name: bitset_test
   gtest: true
   build: test
@@ -9462,6 +9645,30 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
+- name: end2end_binder_transport_test
+  gtest: true
+  build: test
+  run: false
+  language: c++
+  headers:
+  - test/core/transport/binder/end2end/fake_binder.h
+  - test/core/transport/binder/end2end/testing_channel_create.h
+  - test/cpp/end2end/test_service_impl.h
+  src:
+  - src/proto/grpc/testing/echo.proto
+  - src/proto/grpc/testing/echo_messages.proto
+  - src/proto/grpc/testing/simple_messages.proto
+  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
+  - test/core/transport/binder/end2end/end2end_binder_transport_test.cc
+  - test/core/transport/binder/end2end/fake_binder.cc
+  - test/core/transport/binder/end2end/testing_channel_create.cc
+  - test/cpp/end2end/test_service_impl.cc
+  deps:
+  - gtest
+  - grpc++_test_util
+  platforms:
+  - linux
+  - posix
 - name: end2end_test
   gtest: true
   build: test
@@ -9493,6 +9700,118 @@ targets:
   - gtest
   - grpc_test_util
   uses_polling: false
+- name: endpoint_binder_pool_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/transport/binder/client/binder_connector.h
+  - src/core/ext/transport/binder/client/channel_create_impl.h
+  - src/core/ext/transport/binder/client/connection_id_generator.h
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
+  - src/core/ext/transport/binder/client/jni_utils.h
+  - src/core/ext/transport/binder/client/security_policy_setting.h
+  - src/core/ext/transport/binder/server/binder_server.h
+  - src/core/ext/transport/binder/transport/binder_stream.h
+  - src/core/ext/transport/binder/transport/binder_transport.h
+  - src/core/ext/transport/binder/utils/binder_auto_utils.h
+  - src/core/ext/transport/binder/utils/ndk_binder.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+  - src/core/ext/transport/binder/wire_format/binder.h
+  - src/core/ext/transport/binder/wire_format/binder_android.h
+  - src/core/ext/transport/binder/wire_format/binder_constants.h
+  - src/core/ext/transport/binder/wire_format/transaction.h
+  - src/core/ext/transport/binder/wire_format/wire_reader.h
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+  - src/core/ext/transport/binder/wire_format/wire_writer.h
+  - src/cpp/client/client_stats_interceptor.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/client/secure_credentials.h
+  - src/cpp/common/secure_auth_context.h
+  - src/cpp/server/backend_metric_recorder.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/secure_server_credentials.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
+  - test/core/transport/binder/mock_objects.h
+  src:
+  - src/core/ext/transport/binder/client/binder_connector.cc
+  - src/core/ext/transport/binder/client/channel_create.cc
+  - src/core/ext/transport/binder/client/channel_create_impl.cc
+  - src/core/ext/transport/binder/client/connection_id_generator.cc
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  - src/core/ext/transport/binder/client/jni_utils.cc
+  - src/core/ext/transport/binder/client/security_policy_setting.cc
+  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  - src/core/ext/transport/binder/server/binder_server.cc
+  - src/core/ext/transport/binder/server/binder_server_credentials.cc
+  - src/core/ext/transport/binder/transport/binder_transport.cc
+  - src/core/ext/transport/binder/utils/ndk_binder.cc
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  - src/core/ext/transport/binder/wire_format/binder_android.cc
+  - src/core/ext/transport/binder/wire_format/binder_constants.cc
+  - src/core/ext/transport/binder/wire_format/transaction.cc
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  - src/core/ext/transport/binder/wire_format/wire_writer.cc
+  - src/cpp/client/call_credentials.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/channel_credentials.cc
+  - src/cpp/client/client_callback.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/client_stats_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/global_callback_hook.cc
+  - src/cpp/client/insecure_credentials.cc
+  - src/cpp/client/secure_credentials.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/secure_auth_context.cc
+  - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
+  - src/cpp/common/tls_certificate_verifier.cc
+  - src/cpp/common/tls_credentials_options.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/backend_metric_recorder.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/insecure_server_credentials.cc
+  - src/cpp/server/secure_server_credentials.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_callback.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
+  - test/core/transport/binder/endpoint_binder_pool_test.cc
+  - test/core/transport/binder/mock_objects.cc
+  deps:
+  - gtest
+  - absl/log:absl_check
+  - absl/log:absl_log
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
 - name: endpoint_config_test
   gtest: true
   build: test
@@ -9857,6 +10176,118 @@ targets:
   deps:
   - gtest
   - grpc_test_util_unsecure
+- name: fake_binder_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/transport/binder/client/binder_connector.h
+  - src/core/ext/transport/binder/client/channel_create_impl.h
+  - src/core/ext/transport/binder/client/connection_id_generator.h
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
+  - src/core/ext/transport/binder/client/jni_utils.h
+  - src/core/ext/transport/binder/client/security_policy_setting.h
+  - src/core/ext/transport/binder/server/binder_server.h
+  - src/core/ext/transport/binder/transport/binder_stream.h
+  - src/core/ext/transport/binder/transport/binder_transport.h
+  - src/core/ext/transport/binder/utils/binder_auto_utils.h
+  - src/core/ext/transport/binder/utils/ndk_binder.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+  - src/core/ext/transport/binder/wire_format/binder.h
+  - src/core/ext/transport/binder/wire_format/binder_android.h
+  - src/core/ext/transport/binder/wire_format/binder_constants.h
+  - src/core/ext/transport/binder/wire_format/transaction.h
+  - src/core/ext/transport/binder/wire_format/wire_reader.h
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+  - src/core/ext/transport/binder/wire_format/wire_writer.h
+  - src/cpp/client/client_stats_interceptor.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/client/secure_credentials.h
+  - src/cpp/common/secure_auth_context.h
+  - src/cpp/server/backend_metric_recorder.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/secure_server_credentials.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
+  - test/core/transport/binder/end2end/fake_binder.h
+  src:
+  - src/core/ext/transport/binder/client/binder_connector.cc
+  - src/core/ext/transport/binder/client/channel_create.cc
+  - src/core/ext/transport/binder/client/channel_create_impl.cc
+  - src/core/ext/transport/binder/client/connection_id_generator.cc
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  - src/core/ext/transport/binder/client/jni_utils.cc
+  - src/core/ext/transport/binder/client/security_policy_setting.cc
+  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  - src/core/ext/transport/binder/server/binder_server.cc
+  - src/core/ext/transport/binder/server/binder_server_credentials.cc
+  - src/core/ext/transport/binder/transport/binder_transport.cc
+  - src/core/ext/transport/binder/utils/ndk_binder.cc
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  - src/core/ext/transport/binder/wire_format/binder_android.cc
+  - src/core/ext/transport/binder/wire_format/binder_constants.cc
+  - src/core/ext/transport/binder/wire_format/transaction.cc
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  - src/core/ext/transport/binder/wire_format/wire_writer.cc
+  - src/cpp/client/call_credentials.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/channel_credentials.cc
+  - src/cpp/client/client_callback.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/client_stats_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/global_callback_hook.cc
+  - src/cpp/client/insecure_credentials.cc
+  - src/cpp/client/secure_credentials.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/secure_auth_context.cc
+  - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
+  - src/cpp/common/tls_certificate_verifier.cc
+  - src/cpp/common/tls_credentials_options.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/backend_metric_recorder.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/insecure_server_credentials.cc
+  - src/cpp/server/secure_server_credentials.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_callback.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
+  - test/core/transport/binder/end2end/fake_binder.cc
+  - test/core/transport/binder/end2end/fake_binder_test.cc
+  deps:
+  - gtest
+  - absl/log:absl_check
+  - absl/log:absl_log
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
 - name: fake_resolver_test
   gtest: true
   build: test
@@ -20218,6 +20649,116 @@ targets:
   deps:
   - gtest
   - grpc_test_util
+- name: transport_stream_receiver_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/transport/binder/client/binder_connector.h
+  - src/core/ext/transport/binder/client/channel_create_impl.h
+  - src/core/ext/transport/binder/client/connection_id_generator.h
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
+  - src/core/ext/transport/binder/client/jni_utils.h
+  - src/core/ext/transport/binder/client/security_policy_setting.h
+  - src/core/ext/transport/binder/server/binder_server.h
+  - src/core/ext/transport/binder/transport/binder_stream.h
+  - src/core/ext/transport/binder/transport/binder_transport.h
+  - src/core/ext/transport/binder/utils/binder_auto_utils.h
+  - src/core/ext/transport/binder/utils/ndk_binder.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+  - src/core/ext/transport/binder/wire_format/binder.h
+  - src/core/ext/transport/binder/wire_format/binder_android.h
+  - src/core/ext/transport/binder/wire_format/binder_constants.h
+  - src/core/ext/transport/binder/wire_format/transaction.h
+  - src/core/ext/transport/binder/wire_format/wire_reader.h
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+  - src/core/ext/transport/binder/wire_format/wire_writer.h
+  - src/cpp/client/client_stats_interceptor.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/client/secure_credentials.h
+  - src/cpp/common/secure_auth_context.h
+  - src/cpp/server/backend_metric_recorder.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/secure_server_credentials.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
+  src:
+  - src/core/ext/transport/binder/client/binder_connector.cc
+  - src/core/ext/transport/binder/client/channel_create.cc
+  - src/core/ext/transport/binder/client/channel_create_impl.cc
+  - src/core/ext/transport/binder/client/connection_id_generator.cc
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  - src/core/ext/transport/binder/client/jni_utils.cc
+  - src/core/ext/transport/binder/client/security_policy_setting.cc
+  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  - src/core/ext/transport/binder/server/binder_server.cc
+  - src/core/ext/transport/binder/server/binder_server_credentials.cc
+  - src/core/ext/transport/binder/transport/binder_transport.cc
+  - src/core/ext/transport/binder/utils/ndk_binder.cc
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  - src/core/ext/transport/binder/wire_format/binder_android.cc
+  - src/core/ext/transport/binder/wire_format/binder_constants.cc
+  - src/core/ext/transport/binder/wire_format/transaction.cc
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  - src/core/ext/transport/binder/wire_format/wire_writer.cc
+  - src/cpp/client/call_credentials.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/channel_credentials.cc
+  - src/cpp/client/client_callback.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/client_stats_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/global_callback_hook.cc
+  - src/cpp/client/insecure_credentials.cc
+  - src/cpp/client/secure_credentials.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/secure_auth_context.cc
+  - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
+  - src/cpp/common/tls_certificate_verifier.cc
+  - src/cpp/common/tls_credentials_options.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/backend_metric_recorder.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/insecure_server_credentials.cc
+  - src/cpp/server/secure_server_credentials.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_callback.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
+  - test/core/transport/binder/transport_stream_receiver_test.cc
+  deps:
+  - gtest
+  - absl/log:absl_check
+  - absl/log:absl_log
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
 - name: try_join_test
   gtest: true
   build: test
@@ -20527,6 +21068,230 @@ targets:
   - posix
   - windows
   uses_polling: false
+- name: wire_reader_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/transport/binder/client/binder_connector.h
+  - src/core/ext/transport/binder/client/channel_create_impl.h
+  - src/core/ext/transport/binder/client/connection_id_generator.h
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
+  - src/core/ext/transport/binder/client/jni_utils.h
+  - src/core/ext/transport/binder/client/security_policy_setting.h
+  - src/core/ext/transport/binder/server/binder_server.h
+  - src/core/ext/transport/binder/transport/binder_stream.h
+  - src/core/ext/transport/binder/transport/binder_transport.h
+  - src/core/ext/transport/binder/utils/binder_auto_utils.h
+  - src/core/ext/transport/binder/utils/ndk_binder.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+  - src/core/ext/transport/binder/wire_format/binder.h
+  - src/core/ext/transport/binder/wire_format/binder_android.h
+  - src/core/ext/transport/binder/wire_format/binder_constants.h
+  - src/core/ext/transport/binder/wire_format/transaction.h
+  - src/core/ext/transport/binder/wire_format/wire_reader.h
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+  - src/core/ext/transport/binder/wire_format/wire_writer.h
+  - src/cpp/client/client_stats_interceptor.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/client/secure_credentials.h
+  - src/cpp/common/secure_auth_context.h
+  - src/cpp/server/backend_metric_recorder.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/secure_server_credentials.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
+  - test/core/transport/binder/mock_objects.h
+  src:
+  - src/core/ext/transport/binder/client/binder_connector.cc
+  - src/core/ext/transport/binder/client/channel_create.cc
+  - src/core/ext/transport/binder/client/channel_create_impl.cc
+  - src/core/ext/transport/binder/client/connection_id_generator.cc
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  - src/core/ext/transport/binder/client/jni_utils.cc
+  - src/core/ext/transport/binder/client/security_policy_setting.cc
+  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  - src/core/ext/transport/binder/server/binder_server.cc
+  - src/core/ext/transport/binder/server/binder_server_credentials.cc
+  - src/core/ext/transport/binder/transport/binder_transport.cc
+  - src/core/ext/transport/binder/utils/ndk_binder.cc
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  - src/core/ext/transport/binder/wire_format/binder_android.cc
+  - src/core/ext/transport/binder/wire_format/binder_constants.cc
+  - src/core/ext/transport/binder/wire_format/transaction.cc
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  - src/core/ext/transport/binder/wire_format/wire_writer.cc
+  - src/cpp/client/call_credentials.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/channel_credentials.cc
+  - src/cpp/client/client_callback.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/client_stats_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/global_callback_hook.cc
+  - src/cpp/client/insecure_credentials.cc
+  - src/cpp/client/secure_credentials.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/secure_auth_context.cc
+  - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
+  - src/cpp/common/tls_certificate_verifier.cc
+  - src/cpp/common/tls_credentials_options.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/backend_metric_recorder.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/insecure_server_credentials.cc
+  - src/cpp/server/secure_server_credentials.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_callback.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
+  - test/core/transport/binder/mock_objects.cc
+  - test/core/transport/binder/wire_reader_test.cc
+  deps:
+  - gtest
+  - absl/log:absl_check
+  - absl/log:absl_log
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
+- name: wire_writer_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/ext/transport/binder/client/binder_connector.h
+  - src/core/ext/transport/binder/client/channel_create_impl.h
+  - src/core/ext/transport/binder/client/connection_id_generator.h
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
+  - src/core/ext/transport/binder/client/jni_utils.h
+  - src/core/ext/transport/binder/client/security_policy_setting.h
+  - src/core/ext/transport/binder/server/binder_server.h
+  - src/core/ext/transport/binder/transport/binder_stream.h
+  - src/core/ext/transport/binder/transport/binder_transport.h
+  - src/core/ext/transport/binder/utils/binder_auto_utils.h
+  - src/core/ext/transport/binder/utils/ndk_binder.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+  - src/core/ext/transport/binder/wire_format/binder.h
+  - src/core/ext/transport/binder/wire_format/binder_android.h
+  - src/core/ext/transport/binder/wire_format/binder_constants.h
+  - src/core/ext/transport/binder/wire_format/transaction.h
+  - src/core/ext/transport/binder/wire_format/wire_reader.h
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+  - src/core/ext/transport/binder/wire_format/wire_writer.h
+  - src/cpp/client/client_stats_interceptor.h
+  - src/cpp/client/create_channel_internal.h
+  - src/cpp/client/secure_credentials.h
+  - src/cpp/common/secure_auth_context.h
+  - src/cpp/server/backend_metric_recorder.h
+  - src/cpp/server/dynamic_thread_pool.h
+  - src/cpp/server/external_connection_acceptor_impl.h
+  - src/cpp/server/health/default_health_check_service.h
+  - src/cpp/server/secure_server_credentials.h
+  - src/cpp/server/thread_pool_interface.h
+  - src/cpp/thread_manager/thread_manager.h
+  - test/core/transport/binder/mock_objects.h
+  src:
+  - src/core/ext/transport/binder/client/binder_connector.cc
+  - src/core/ext/transport/binder/client/channel_create.cc
+  - src/core/ext/transport/binder/client/channel_create_impl.cc
+  - src/core/ext/transport/binder/client/connection_id_generator.cc
+  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+  - src/core/ext/transport/binder/client/jni_utils.cc
+  - src/core/ext/transport/binder/client/security_policy_setting.cc
+  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+  - src/core/ext/transport/binder/server/binder_server.cc
+  - src/core/ext/transport/binder/server/binder_server_credentials.cc
+  - src/core/ext/transport/binder/transport/binder_transport.cc
+  - src/core/ext/transport/binder/utils/ndk_binder.cc
+  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+  - src/core/ext/transport/binder/wire_format/binder_android.cc
+  - src/core/ext/transport/binder/wire_format/binder_constants.cc
+  - src/core/ext/transport/binder/wire_format/transaction.cc
+  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+  - src/core/ext/transport/binder/wire_format/wire_writer.cc
+  - src/cpp/client/call_credentials.cc
+  - src/cpp/client/channel_cc.cc
+  - src/cpp/client/channel_credentials.cc
+  - src/cpp/client/client_callback.cc
+  - src/cpp/client/client_context.cc
+  - src/cpp/client/client_interceptor.cc
+  - src/cpp/client/client_stats_interceptor.cc
+  - src/cpp/client/create_channel.cc
+  - src/cpp/client/create_channel_internal.cc
+  - src/cpp/client/create_channel_posix.cc
+  - src/cpp/client/global_callback_hook.cc
+  - src/cpp/client/insecure_credentials.cc
+  - src/cpp/client/secure_credentials.cc
+  - src/cpp/common/alarm.cc
+  - src/cpp/common/auth_property_iterator.cc
+  - src/cpp/common/channel_arguments.cc
+  - src/cpp/common/completion_queue_cc.cc
+  - src/cpp/common/resource_quota_cc.cc
+  - src/cpp/common/rpc_method.cc
+  - src/cpp/common/secure_auth_context.cc
+  - src/cpp/common/secure_create_auth_context.cc
+  - src/cpp/common/tls_certificate_provider.cc
+  - src/cpp/common/tls_certificate_verifier.cc
+  - src/cpp/common/tls_credentials_options.cc
+  - src/cpp/common/validate_service_config.cc
+  - src/cpp/common/version_cc.cc
+  - src/cpp/server/async_generic_service.cc
+  - src/cpp/server/backend_metric_recorder.cc
+  - src/cpp/server/channel_argument_option.cc
+  - src/cpp/server/create_default_thread_pool.cc
+  - src/cpp/server/external_connection_acceptor_impl.cc
+  - src/cpp/server/health/default_health_check_service.cc
+  - src/cpp/server/health/health_check_service.cc
+  - src/cpp/server/health/health_check_service_server_builder_option.cc
+  - src/cpp/server/insecure_server_credentials.cc
+  - src/cpp/server/secure_server_credentials.cc
+  - src/cpp/server/server_builder.cc
+  - src/cpp/server/server_callback.cc
+  - src/cpp/server/server_cc.cc
+  - src/cpp/server/server_context.cc
+  - src/cpp/server/server_credentials.cc
+  - src/cpp/server/server_posix.cc
+  - src/cpp/thread_manager/thread_manager.cc
+  - src/cpp/util/byte_buffer_cc.cc
+  - src/cpp/util/status.cc
+  - src/cpp/util/string_ref.cc
+  - src/cpp/util/time_cc.cc
+  - test/core/transport/binder/mock_objects.cc
+  - test/core/transport/binder/wire_writer_test.cc
+  deps:
+  - gtest
+  - absl/log:absl_check
+  - absl/log:absl_log
+  - protobuf
+  - grpc_test_util
+  uses_polling: false
 - name: work_serializer_test
   gtest: true
   build: test
diff --git a/config.m4 b/config.m4
index 8a5692bac9a..cd9212d3572 100644
--- a/config.m4
+++ b/config.m4
@@ -730,6 +730,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/load_balancing/xds/xds_wrr_locality.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
+    src/core/resolver/binder/binder_resolver.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
@@ -1600,6 +1601,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/xds)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/binder)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/c_ares)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/event_engine)
diff --git a/config.w32 b/config.w32
index 088607cb0a0..b590018a1bd 100644
--- a/config.w32
+++ b/config.w32
@@ -695,6 +695,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\load_balancing\\xds\\xds_wrr_locality.cc " +
     "src\\core\\plugin_registry\\grpc_plugin_registry.cc " +
     "src\\core\\plugin_registry\\grpc_plugin_registry_extra.cc " +
+    "src\\core\\resolver\\binder\\binder_resolver.cc " +
     "src\\core\\resolver\\dns\\c_ares\\dns_resolver_ares.cc " +
     "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_posix.cc " +
     "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_windows.cc " +
@@ -1740,6 +1741,7 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\xds");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\plugin_registry");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\binder");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\c_ares");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\event_engine");
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 5f416533062..aeb929b9ad6 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -97,6 +97,7 @@ Pod::Spec.new do |s|
                       'include/grpcpp/client_context.h',
                       'include/grpcpp/completion_queue.h',
                       'include/grpcpp/create_channel.h',
+                      'include/grpcpp/create_channel_binder.h',
                       'include/grpcpp/create_channel_posix.h',
                       'include/grpcpp/ext/call_metric_recorder.h',
                       'include/grpcpp/ext/health_check_service_server_builder_option.h',
@@ -184,6 +185,8 @@ Pod::Spec.new do |s|
                       'include/grpcpp/security/auth_context.h',
                       'include/grpcpp/security/auth_metadata_processor.h',
                       'include/grpcpp/security/authorization_policy_provider.h',
+                      'include/grpcpp/security/binder_credentials.h',
+                      'include/grpcpp/security/binder_security_policy.h',
                       'include/grpcpp/security/credentials.h',
                       'include/grpcpp/security/server_credentials.h',
                       'include/grpcpp/security/tls_certificate_provider.h',
@@ -310,6 +313,44 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/rbac/rbac_service_config_parser.h',
                       'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                       'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
+                      'src/core/ext/transport/binder/client/binder_connector.cc',
+                      'src/core/ext/transport/binder/client/binder_connector.h',
+                      'src/core/ext/transport/binder/client/channel_create.cc',
+                      'src/core/ext/transport/binder/client/channel_create_impl.cc',
+                      'src/core/ext/transport/binder/client/channel_create_impl.h',
+                      'src/core/ext/transport/binder/client/connection_id_generator.cc',
+                      'src/core/ext/transport/binder/client/connection_id_generator.h',
+                      'src/core/ext/transport/binder/client/endpoint_binder_pool.cc',
+                      'src/core/ext/transport/binder/client/endpoint_binder_pool.h',
+                      'src/core/ext/transport/binder/client/jni_utils.cc',
+                      'src/core/ext/transport/binder/client/jni_utils.h',
+                      'src/core/ext/transport/binder/client/security_policy_setting.cc',
+                      'src/core/ext/transport/binder/client/security_policy_setting.h',
+                      'src/core/ext/transport/binder/security_policy/binder_security_policy.cc',
+                      'src/core/ext/transport/binder/server/binder_server.cc',
+                      'src/core/ext/transport/binder/server/binder_server.h',
+                      'src/core/ext/transport/binder/server/binder_server_credentials.cc',
+                      'src/core/ext/transport/binder/transport/binder_stream.h',
+                      'src/core/ext/transport/binder/transport/binder_transport.cc',
+                      'src/core/ext/transport/binder/transport/binder_transport.h',
+                      'src/core/ext/transport/binder/utils/binder_auto_utils.h',
+                      'src/core/ext/transport/binder/utils/ndk_binder.cc',
+                      'src/core/ext/transport/binder/utils/ndk_binder.h',
+                      'src/core/ext/transport/binder/utils/transport_stream_receiver.h',
+                      'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc',
+                      'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h',
+                      'src/core/ext/transport/binder/wire_format/binder.h',
+                      'src/core/ext/transport/binder/wire_format/binder_android.cc',
+                      'src/core/ext/transport/binder/wire_format/binder_android.h',
+                      'src/core/ext/transport/binder/wire_format/binder_constants.cc',
+                      'src/core/ext/transport/binder/wire_format/binder_constants.h',
+                      'src/core/ext/transport/binder/wire_format/transaction.cc',
+                      'src/core/ext/transport/binder/wire_format/transaction.h',
+                      'src/core/ext/transport/binder/wire_format/wire_reader.h',
+                      'src/core/ext/transport/binder/wire_format/wire_reader_impl.cc',
+                      'src/core/ext/transport/binder/wire_format/wire_reader_impl.h',
+                      'src/core/ext/transport/binder/wire_format/wire_writer.cc',
+                      'src/core/ext/transport/binder/wire_format/wire_writer.h',
                       'src/core/ext/transport/chttp2/alpn/alpn.h',
                       'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                       'src/core/ext/transport/chttp2/server/chttp2_server.h',
@@ -1595,6 +1636,26 @@ Pod::Spec.new do |s|
                               'src/core/ext/filters/rbac/rbac_service_config_parser.h',
                               'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                               'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
+                              'src/core/ext/transport/binder/client/binder_connector.h',
+                              'src/core/ext/transport/binder/client/channel_create_impl.h',
+                              'src/core/ext/transport/binder/client/connection_id_generator.h',
+                              'src/core/ext/transport/binder/client/endpoint_binder_pool.h',
+                              'src/core/ext/transport/binder/client/jni_utils.h',
+                              'src/core/ext/transport/binder/client/security_policy_setting.h',
+                              'src/core/ext/transport/binder/server/binder_server.h',
+                              'src/core/ext/transport/binder/transport/binder_stream.h',
+                              'src/core/ext/transport/binder/transport/binder_transport.h',
+                              'src/core/ext/transport/binder/utils/binder_auto_utils.h',
+                              'src/core/ext/transport/binder/utils/ndk_binder.h',
+                              'src/core/ext/transport/binder/utils/transport_stream_receiver.h',
+                              'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h',
+                              'src/core/ext/transport/binder/wire_format/binder.h',
+                              'src/core/ext/transport/binder/wire_format/binder_android.h',
+                              'src/core/ext/transport/binder/wire_format/binder_constants.h',
+                              'src/core/ext/transport/binder/wire_format/transaction.h',
+                              'src/core/ext/transport/binder/wire_format/wire_reader.h',
+                              'src/core/ext/transport/binder/wire_format/wire_reader_impl.h',
+                              'src/core/ext/transport/binder/wire_format/wire_writer.h',
                               'src/core/ext/transport/chttp2/alpn/alpn.h',
                               'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                               'src/core/ext/transport/chttp2/server/chttp2_server.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index a30b17d89f7..26ed8c8dfab 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1818,6 +1818,7 @@ Pod::Spec.new do |s|
                       'src/core/load_balancing/xds/xds_wrr_locality.cc',
                       'src/core/plugin_registry/grpc_plugin_registry.cc',
                       'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
+                      'src/core/resolver/binder/binder_resolver.cc',
                       'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
                       'src/core/resolver/dns/c_ares/dns_resolver_ares.h',
                       'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 01ed6ca79d7..349abdf9586 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1704,6 +1704,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/load_balancing/xds/xds_wrr_locality.cc )
   s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )
   s.files += %w( src/core/plugin_registry/grpc_plugin_registry_extra.cc )
+  s.files += %w( src/core/resolver/binder/binder_resolver.cc )
   s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.cc )
   s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.h )
   s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h )
diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h
index 8f0d1fa933c..5fb7426af2b 100644
--- a/include/grpc/support/port_platform.h
+++ b/include/grpc/support/port_platform.h
@@ -172,6 +172,7 @@
 #if __ANDROID_API__ < 21
 #error "Requires Android API v21 and above"
 #endif
+#define GPR_SUPPORT_BINDER_TRANSPORT 1
 // TODO(apolcyn): re-evaluate support for c-ares
 // on android after upgrading our c-ares dependency.
 // See https://github.com/grpc/grpc/issues/18038.
diff --git a/include/grpcpp/security/binder_security_policy.h b/include/grpcpp/security/binder_security_policy.h
new file mode 100644
index 00000000000..e1c951fc660
--- /dev/null
+++ b/include/grpcpp/security/binder_security_policy.h
@@ -0,0 +1,82 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
+#define GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
+
+#include <memory>
+
+#ifdef GPR_ANDROID
+
+#include <jni.h>
+
+#endif
+
+namespace grpc {
+namespace experimental {
+namespace binder {
+
+// EXPERIMENTAL Determinines if a connection is allowed to be
+// established on Android. See https://source.android.com/security/app-sandbox
+// for more info about UID.
+class SecurityPolicy {
+ public:
+  virtual ~SecurityPolicy() = default;
+  // Returns true if the UID is authorized to connect.
+  // Must return the same value for the same inputs so callers can safely cache
+  // the result.
+  virtual bool IsAuthorized(int uid) = 0;
+};
+
+// EXPERIMENTAL Allows all connection. Anything on the Android device will be
+// able to connect, use with caution!
+class UntrustedSecurityPolicy : public SecurityPolicy {
+ public:
+  UntrustedSecurityPolicy();
+  ~UntrustedSecurityPolicy() override;
+  bool IsAuthorized(int uid) override;
+};
+
+// EXPERIMENTAL Only allows the connections from processes with the same UID. In
+// most cases this means "from the same APK".
+class InternalOnlySecurityPolicy : public SecurityPolicy {
+ public:
+  InternalOnlySecurityPolicy();
+  ~InternalOnlySecurityPolicy() override;
+  bool IsAuthorized(int uid) override;
+};
+
+#ifdef GPR_ANDROID
+
+// EXPERIMENTAL Only allows the connections from the APK that have the same
+// signature.
+class SameSignatureSecurityPolicy : public SecurityPolicy {
+ public:
+  // `context` is required for getting PackageManager Java class
+  SameSignatureSecurityPolicy(JavaVM* jvm, jobject context);
+  ~SameSignatureSecurityPolicy() override;
+  bool IsAuthorized(int uid) override;
+
+ private:
+  JavaVM* jvm_;
+  jobject context_;
+};
+
+#endif
+
+}  // namespace binder
+}  // namespace experimental
+}  // namespace grpc
+
+#endif  // GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
diff --git a/package.xml b/package.xml
index bf2736bb0bc..3add46c2e40 100644
--- a/package.xml
+++ b/package.xml
@@ -1686,6 +1686,7 @@
     <file baseinstalldir="/" name="src/core/load_balancing/xds/xds_wrr_locality.cc" role="src" />
     <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
     <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry_extra.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/resolver/binder/binder_resolver.cc" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.cc" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.h" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" role="src" />
diff --git a/src/core/BUILD b/src/core/BUILD
index 5df2ee07cd9..5f6adbeb898 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -33,7 +33,10 @@ package(
 # the top-level BUILD file that have not yet been moved here. Should go away
 # once the transition is complete.
 exports_files(
-    glob(["**"]),
+    glob(
+        ["**"],
+        exclude = ["ext/transport/binder/java/**"],
+    ),
     visibility = ["//:__subpackages__"],
 )
 
@@ -7155,6 +7158,33 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "grpc_resolver_binder",
+    srcs = [
+        "resolver/binder/binder_resolver.cc",
+    ],
+    external_deps = [
+        "absl/log:log",
+        "absl/status",
+        "absl/status:statusor",
+        "absl/strings",
+    ],
+    language = "c++",
+    deps = [
+        "channel_args",
+        "error",
+        "iomgr_port",
+        "resolved_address",
+        "status_helper",
+        "//:config",
+        "//:endpoint_addresses",
+        "//:gpr",
+        "//:grpc_resolver",
+        "//:orphanable",
+        "//:uri",
+    ],
+)
+
 grpc_cc_library(
     name = "grpc_resolver_xds_attributes",
     hdrs = [
diff --git a/src/core/ext/transport/binder/README.md b/src/core/ext/transport/binder/README.md
new file mode 100644
index 00000000000..74200cd371d
--- /dev/null
+++ b/src/core/ext/transport/binder/README.md
@@ -0,0 +1,10 @@
+# Binder transport for cross process IPC on Android
+
+EXPERIMENTAL. API stability not guaranteed.
+
+This transport implements
+[BinderChannel for native cross-process communication on Android](https://github.com/grpc/proposal/blob/master/L73-java-binderchannel.md) and enables C++/Java cross-process communication on Android with gRPC.
+
+Tests: https://github.com/grpc/grpc/tree/master/test/core/transport/binder/
+
+Example apps: https://github.com/grpc/grpc/tree/master/examples/android/binder/java/io/grpc/binder/cpp
diff --git a/src/core/ext/transport/binder/client/channel_create_impl.h b/src/core/ext/transport/binder/client/channel_create_impl.h
new file mode 100644
index 00000000000..0cc87a5a62e
--- /dev/null
+++ b/src/core/ext/transport/binder/client/channel_create_impl.h
@@ -0,0 +1,42 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
+
+#include <grpc/support/port_platform.h>
+#include <grpcpp/security/binder_security_policy.h>
+
+#include "src/core/ext/transport/binder/wire_format/binder.h"
+#include "src/core/lib/channel/channel_args.h"
+
+namespace grpc {
+namespace internal {
+
+// Creates a GRPC_CLIENT_DIRECT_CHANNEL channel from endpoint binder
+// At this moment this is only used for testing.
+grpc_channel* CreateDirectBinderChannelImplForTesting(
+    std::unique_ptr<grpc_binder::Binder> endpoint_binder,
+    const grpc_channel_args* args,
+    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
+        security_policy);
+
+// Creates a GRPC_CLIENT_CHANNEL channel
+grpc_channel* CreateClientBinderChannelImpl(std::string target,
+                                            const grpc_channel_args* args);
+
+}  // namespace internal
+}  // namespace grpc
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
diff --git a/src/core/ext/transport/binder/client/connection_id_generator.cc b/src/core/ext/transport/binder/client/connection_id_generator.cc
new file mode 100644
index 00000000000..60cba34e31b
--- /dev/null
+++ b/src/core/ext/transport/binder/client/connection_id_generator.cc
@@ -0,0 +1,69 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "src/core/ext/transport/binder/client/connection_id_generator.h"
+
+#include <grpc/support/port_platform.h>
+
+#ifndef GRPC_NO_BINDER
+
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
+
+namespace {
+// Make sure `s` does not contain characters other than numbers, alphabets,
+// period and underscore
+std::string Normalize(absl::string_view str_view) {
+  std::string s = std::string(str_view);
+  for (size_t i = 0; i < s.length(); i++) {
+    if (!isalnum(s[i]) && s[i] != '.') {
+      s[i] = '_';
+    }
+  }
+  return s;
+}
+
+// Remove prefix of the string if the string is longer than len
+std::string StripToLength(const std::string& s, size_t len) {
+  if (s.length() > len) {
+    return s.substr(s.length() - len, len);
+  }
+  return s;
+}
+}  // namespace
+
+namespace grpc_binder {
+
+std::string ConnectionIdGenerator::Generate(absl::string_view uri) {
+  // reserve some room for serial number
+  const size_t kReserveForNumbers = 15;
+  std::string s =
+      StripToLength(Normalize(uri), kPathLengthLimit - kReserveForNumbers);
+  std::string ret;
+  {
+    grpc_core::MutexLock l(&m_);
+    // Insert a hyphen before serial number
+    ret = absl::StrCat(s, "-", ++count_);
+  }
+  CHECK_LT(ret.length(), kPathLengthLimit);
+  return ret;
+}
+
+ConnectionIdGenerator* GetConnectionIdGenerator() {
+  static ConnectionIdGenerator* cig = new ConnectionIdGenerator();
+  return cig;
+}
+
+}  // namespace grpc_binder
+#endif
diff --git a/src/core/ext/transport/binder/java/WORKSPACE b/src/core/ext/transport/binder/java/WORKSPACE
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
new file mode 100644
index 00000000000..5e63c32bc51
--- /dev/null
+++ b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
@@ -0,0 +1,30 @@
+# Copyright 2021 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# copybara: Import internal android_library rule here
+
+licenses(["notice"])
+
+android_library(
+    name = "connection_helper",
+    srcs = [
+        "GrpcBinderConnection.java",
+        "GrpcCppServerBuilder.java",
+        "NativeConnectionHelper.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        # copybara: Add proguard dependency here
+    ],
+)
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
new file mode 100644
index 00000000000..b55fe7405e7
--- /dev/null
+++ b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
@@ -0,0 +1,104 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package io.grpc.binder.cpp;
+
+import static android.content.Intent.URI_ANDROID_APP_SCHEME;
+import static android.content.Intent.URI_INTENT_SCHEME;
+
+import android.annotation.TargetApi;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.util.Log;
+import java.net.URISyntaxException;
+
+/* Handles the binder connection state with OnDeviceServer server */
+public class GrpcBinderConnection implements ServiceConnection {
+  private static final String logTag = "GrpcBinderConnection";
+
+  private Context mContext;
+  private IBinder mService;
+
+  // A string that identifies this service connection
+  private final String mConnId;
+
+  public GrpcBinderConnection(Context context, String connId) {
+    mContext = context;
+    mConnId = connId;
+  }
+
+  @Override
+  public void onNullBinding(ComponentName className) {
+    // TODO(mingcl): Notify C++ that the connection is never going to happen
+    Log.e(logTag, "Service returned null IBinder. mConnId = " + mConnId);
+  }
+
+  @Override
+  public void onServiceConnected(ComponentName className, IBinder service) {
+    Log.e(logTag, "Service has connected. mConnId = " + mConnId);
+    if (service == null) {
+      // This should not happen since onNullBinding should be invoked instead
+      throw new IllegalArgumentException("service was null");
+    }
+    synchronized (this) {
+      mService = service;
+    }
+    notifyConnected(mConnId, mService);
+  }
+
+  @Override
+  public void onServiceDisconnected(ComponentName className) {
+    Log.e(logTag, "Service has disconnected. mConnId = " + mConnId);
+  }
+
+  public void tryConnect(String pkg, String cls, String action_name) {
+    Intent intent = new Intent(action_name);
+    ComponentName compName = new ComponentName(pkg, cls);
+    intent.setComponent(compName);
+    tryConnect(intent);
+  }
+
+  @TargetApi(22)
+  public void tryConnect(String uri) {
+    // Try connect with an URI that can be parsed as intent.
+    try {
+      tryConnect(Intent.parseUri(uri, URI_ANDROID_APP_SCHEME | URI_INTENT_SCHEME));
+    } catch (URISyntaxException e) {
+      Log.e(logTag, "Unable to parse the Uri: " + uri);
+    }
+  }
+
+  private void tryConnect(Intent intent) {
+    synchronized (this) {
+      // Will return true if the system is in the process of bringing up a service that your client
+      // has permission to bind to; false if the system couldn't find the service or if your client
+      // doesn't have permission to bind to it
+      boolean result = mContext.bindService(intent, this, Context.BIND_AUTO_CREATE);
+      if (result) {
+        Log.e(logTag, "bindService returns ok");
+      } else {
+        Log.e(
+            logTag,
+            "bindService failed. Maybe the system couldn't find the service or the"
+                + " client doesn't have permission to bind to it.");
+      }
+    }
+  }
+
+  // Calls a function defined in endpoint_binder_pool.cc
+  private static native void notifyConnected(String connId, IBinder service);
+}
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
new file mode 100644
index 00000000000..680a38e5fee
--- /dev/null
+++ b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
@@ -0,0 +1,40 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package io.grpc.binder.cpp;
+
+import android.os.IBinder;
+import android.util.Log;
+
+/* EXPERIMENTAL. Provides a interface to get endpoint binder from C++ */
+public class GrpcCppServerBuilder {
+  private static final String logTag = "GrpcCppServerBuilder";
+
+  public static IBinder GetEndpointBinder(String uri) {
+    String scheme = "binder:";
+    if (uri.startsWith(scheme)) {
+      String path = uri.substring(scheme.length());
+      // TODO(mingcl): Consider if we would like to make sure the path only contain valid
+      // characters here
+      IBinder ibinder = GetEndpointBinderInternal(path);
+      Log.e(logTag, "Returning binder=" + ibinder + " for URI=" + uri);
+      return ibinder;
+    } else {
+      Log.e(logTag, "URI " + uri + " does not start with 'binder:'");
+      return null;
+    }
+  }
+
+  private static native IBinder GetEndpointBinderInternal(String conn_id);
+}
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
new file mode 100644
index 00000000000..6a05c88ff37
--- /dev/null
+++ b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
@@ -0,0 +1,71 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package io.grpc.binder.cpp;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Parcel;
+import android.util.Log;
+// copybara: Import proguard UsedByNative annotation here
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class will be invoked by gRPC binder transport internal implementation (from
+ * src/core/ext/transport/binder/client/jni_utils.cc) to perform operations that are only possible
+ * in Java
+ */
+// copybara: Add @UsedByNative("jni_utils.cc")
+final class NativeConnectionHelper {
+  // Maps connection id to GrpcBinderConnection instances
+  static Map<String, GrpcBinderConnection> connectionIdToGrpcBinderConnectionMap = new HashMap<>();
+
+  // copybara: Add @UsedByNative("jni_utils.cc")
+  static void tryEstablishConnection(
+      Context context, String pkg, String cls, String actionName, String connId) {
+    // TODO(mingcl): Assert that connId is unique
+    connectionIdToGrpcBinderConnectionMap.put(connId, new GrpcBinderConnection(context, connId));
+    connectionIdToGrpcBinderConnectionMap.get(connId).tryConnect(pkg, cls, actionName);
+  }
+
+  // copybara: Add @UsedByNative("jni_utils.cc")
+  static void tryEstablishConnectionWithUri(Context context, String uri, String connId) {
+    // TODO(mingcl): Assert that connId is unique
+    connectionIdToGrpcBinderConnectionMap.put(connId, new GrpcBinderConnection(context, connId));
+    connectionIdToGrpcBinderConnectionMap.get(connId).tryConnect(uri);
+  }
+
+  // Returns true if the packages signature of the 2 UIDs match.
+  // `context` is used to get PackageManager.
+  // Suppress unnecessary internal warnings related to checkSignatures compatibility issue.
+  // BinderTransport code is only used on newer Android platform versions so this is fine.
+  @SuppressWarnings("CheckSignatures")
+  // copybara: Add @UsedByNative("jni_utils.cc")
+  static boolean isSignatureMatch(Context context, int uid1, int uid2) {
+    int result = context.getPackageManager().checkSignatures(uid1, uid2);
+    if (result == PackageManager.SIGNATURE_MATCH) {
+      return true;
+    }
+    Log.e(
+        "NativeConnectionHelper",
+        "Signatures does not match. checkSignature return value = " + result);
+    return false;
+  }
+
+  // copybara: Add @UsedByNative("jni_utils.cc")
+  static Parcel getEmptyParcel() {
+    return Parcel.obtain();
+  }
+}
diff --git a/src/core/ext/transport/binder/security_policy/security_policy.h b/src/core/ext/transport/binder/security_policy/security_policy.h
new file mode 100644
index 00000000000..4ef3da352f2
--- /dev/null
+++ b/src/core/ext/transport/binder/security_policy/security_policy.h
@@ -0,0 +1,40 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
+
+#include <grpc/support/port_platform.h>
+
+namespace grpc {
+namespace experimental {
+namespace binder {
+
+// This interface is for determining if a connection is allowed to be
+// established on Android. See https://source.android.com/security/app-sandbox
+// for more info about UID.
+class SecurityPolicy {
+ public:
+  virtual ~SecurityPolicy() = default;
+  // Returns true if the UID is authorized to connect.
+  // Must return the same value for the same inputs so callers can safely cache
+  // the result.
+  virtual bool IsAuthorized(int uid) = 0;
+};
+
+}  // namespace binder
+}  // namespace experimental
+}  // namespace grpc
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
diff --git a/src/core/ext/transport/binder/transport/binder_stream.h b/src/core/ext/transport/binder/transport/binder_stream.h
new file mode 100644
index 00000000000..afd0c414514
--- /dev/null
+++ b/src/core/ext/transport/binder/transport/binder_stream.h
@@ -0,0 +1,117 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/transport/binder/transport/binder_transport.h"
+
+struct RecvInitialMetadataArgs {
+  grpc_binder_stream* stream;
+  grpc_binder_transport* transport;
+  int tx_code;
+  absl::StatusOr<grpc_binder::Metadata> initial_metadata;
+};
+
+struct RecvMessageArgs {
+  grpc_binder_stream* stream;
+  grpc_binder_transport* transport;
+  int tx_code;
+  absl::StatusOr<std::string> message;
+};
+
+struct RecvTrailingMetadataArgs {
+  grpc_binder_stream* stream;
+  grpc_binder_transport* transport;
+  int tx_code;
+  absl::StatusOr<grpc_binder::Metadata> trailing_metadata;
+  int status;
+};
+
+struct RegisterStreamArgs {
+  grpc_binder_stream* stream;
+  grpc_binder_transport* transport;
+};
+
+// TODO(mingcl): Figure out if we want to use class instead of struct here
+struct grpc_binder_stream {
+  // server_data will be null for client, and for server it will be whatever
+  // passed in to the accept_stream_fn callback by client.
+  grpc_binder_stream(grpc_binder_transport* t, grpc_stream_refcount* refcount,
+                     const void* /*server_data*/, grpc_core::Arena* arena,
+                     int tx_code, bool is_client)
+      : t(t),
+        refcount(refcount),
+        arena(arena),
+        tx_code(tx_code),
+        is_client(is_client),
+        is_closed(false) {
+    recv_initial_metadata_args.stream = this;
+    recv_initial_metadata_args.transport = t;
+    recv_message_args.stream = this;
+    recv_message_args.transport = t;
+    recv_trailing_metadata_args.stream = this;
+    recv_trailing_metadata_args.transport = t;
+  }
+
+  ~grpc_binder_stream() {
+    if (destroy_stream_then_closure != nullptr) {
+      grpc_core::ExecCtx::Run(DEBUG_LOCATION, destroy_stream_then_closure,
+                              absl::OkStatus());
+    }
+  }
+
+  int GetTxCode() const { return tx_code; }
+
+  grpc_binder_transport* t;
+  grpc_stream_refcount* refcount;
+  grpc_core::Arena* arena;
+  int tx_code;
+  const bool is_client;
+  bool is_closed;
+
+  grpc_closure* destroy_stream_then_closure = nullptr;
+  grpc_closure destroy_stream;
+
+  // The reason why this stream is cancelled and closed.
+  grpc_error_handle cancel_self_error;
+
+  grpc_closure recv_initial_metadata_closure;
+  RecvInitialMetadataArgs recv_initial_metadata_args;
+  grpc_closure recv_message_closure;
+  RecvMessageArgs recv_message_args;
+  grpc_closure recv_trailing_metadata_closure;
+  RecvTrailingMetadataArgs recv_trailing_metadata_args;
+
+  grpc_closure register_stream_closure;
+  RegisterStreamArgs register_stream_args;
+
+  // We store these fields passed from op batch, in order to access them through
+  // grpc_binder_stream
+  grpc_metadata_batch* recv_initial_metadata;
+  grpc_closure* recv_initial_metadata_ready = nullptr;
+  bool* trailing_metadata_available = nullptr;
+  absl::optional<grpc_core::SliceBuffer>* recv_message;
+  grpc_closure* recv_message_ready = nullptr;
+  bool* call_failed_before_recv_message = nullptr;
+  grpc_metadata_batch* recv_trailing_metadata;
+  grpc_closure* recv_trailing_metadata_finished = nullptr;
+
+  bool trailing_metadata_sent = false;
+  bool need_to_call_trailing_metadata_callback = false;
+};
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
diff --git a/src/core/ext/transport/binder/utils/binder_auto_utils.h b/src/core/ext/transport/binder/utils/binder_auto_utils.h
new file mode 100644
index 00000000000..c72f7760761
--- /dev/null
+++ b/src/core/ext/transport/binder/utils/binder_auto_utils.h
@@ -0,0 +1,76 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
+
+#include <grpc/support/port_platform.h>
+
+#ifdef GPR_SUPPORT_BINDER_TRANSPORT
+
+#include "src/core/ext/transport/binder/utils/ndk_binder.h"
+
+namespace grpc_binder {
+namespace ndk_util {
+
+///
+/// Represents one strong pointer to an AIBinder object.
+/// Copied from binder/ndk/include_cpp/android/binder_auto_utils.h
+///
+class SpAIBinder {
+ public:
+  SpAIBinder() : mBinder(nullptr) {}
+  explicit SpAIBinder(AIBinder* binder) : mBinder(binder) {}
+  SpAIBinder(std::nullptr_t)
+      : SpAIBinder() {}  // NOLINT(google-explicit-constructor)
+  SpAIBinder(const SpAIBinder& other) { *this = other; }
+
+  ~SpAIBinder() { set(nullptr); }
+  SpAIBinder& operator=(const SpAIBinder& other) {
+    if (this == &other) {
+      return *this;
+    }
+    AIBinder_incStrong(other.mBinder);
+    set(other.mBinder);
+    return *this;
+  }
+
+  void set(AIBinder* binder) {
+    AIBinder* old = *const_cast<AIBinder* volatile*>(&mBinder);
+    if (old != nullptr) AIBinder_decStrong(old);
+    if (old != *const_cast<AIBinder* volatile*>(&mBinder)) {
+      __assert(__FILE__, __LINE__, "Race detected.");
+    }
+    mBinder = binder;
+  }
+
+  AIBinder* get() const { return mBinder; }
+  AIBinder** getR() { return &mBinder; }
+
+  bool operator!=(const SpAIBinder& rhs) const { return get() != rhs.get(); }
+  bool operator<(const SpAIBinder& rhs) const { return get() < rhs.get(); }
+  bool operator<=(const SpAIBinder& rhs) const { return get() <= rhs.get(); }
+  bool operator==(const SpAIBinder& rhs) const { return get() == rhs.get(); }
+  bool operator>(const SpAIBinder& rhs) const { return get() > rhs.get(); }
+  bool operator>=(const SpAIBinder& rhs) const { return get() >= rhs.get(); }
+
+ private:
+  AIBinder* mBinder = nullptr;
+};
+}  // namespace ndk_util
+}  // namespace grpc_binder
+
+#endif
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
diff --git a/src/core/ext/transport/binder/utils/ndk_binder.h b/src/core/ext/transport/binder/utils/ndk_binder.h
new file mode 100644
index 00000000000..1ca82c81625
--- /dev/null
+++ b/src/core/ext/transport/binder/utils/ndk_binder.h
@@ -0,0 +1,107 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
+
+#include <grpc/support/port_platform.h>
+
+#ifdef GPR_SUPPORT_BINDER_TRANSPORT
+
+#include <assert.h>
+#include <jni.h>
+
+#include <memory>
+
+// This file defines NdkBinder functions, variables, and types in
+// grpc_binder::ndk_util namespace. This allows us to dynamically load
+// libbinder_ndk at runtime, and make it possible to compile the code without
+// the library present at compile time.
+
+// TODO(mingcl): Consider if we want to check API level and include NDK headers
+// normally if the level is high enough
+
+namespace grpc_binder {
+namespace ndk_util {
+
+struct AIBinder;
+struct AParcel;
+struct AIBinder_Class;
+
+// Only enum values used by the project is defined here
+enum {
+  FLAG_ONEWAY = 0x01,
+};
+enum {
+  STATUS_OK = 0,
+  STATUS_UNKNOWN_ERROR = (-2147483647 - 1),
+};
+
+typedef int32_t binder_status_t;
+typedef uint32_t binder_flags_t;
+typedef uint32_t transaction_code_t;
+
+typedef bool (*AParcel_byteArrayAllocator)(void* arrayData, int32_t length,
+                                           int8_t** outBuffer);
+typedef bool (*AParcel_stringAllocator)(void* stringData, int32_t length,
+                                        char** buffer);
+typedef void* (*AIBinder_Class_onCreate)(void* args);
+typedef void (*AIBinder_Class_onDestroy)(void* userData);
+typedef binder_status_t (*AIBinder_Class_onTransact)(AIBinder* binder,
+                                                     transaction_code_t code,
+                                                     const AParcel* in,
+                                                     AParcel* out);
+
+void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz);
+void* AIBinder_getUserData(AIBinder* binder);
+uid_t AIBinder_getCallingUid();
+AIBinder* AIBinder_fromJavaBinder(JNIEnv* env, jobject binder);
+AIBinder_Class* AIBinder_Class_define(const char* interfaceDescriptor,
+                                      AIBinder_Class_onCreate onCreate,
+                                      AIBinder_Class_onDestroy onDestroy,
+                                      AIBinder_Class_onTransact onTransact);
+AIBinder* AIBinder_new(const AIBinder_Class* clazz, void* args);
+bool AIBinder_associateClass(AIBinder* binder, const AIBinder_Class* clazz);
+void AIBinder_incStrong(AIBinder* binder);
+void AIBinder_decStrong(AIBinder* binder);
+binder_status_t AIBinder_transact(AIBinder* binder, transaction_code_t code,
+                                  AParcel** in, AParcel** out,
+                                  binder_flags_t flags);
+binder_status_t AParcel_readByteArray(const AParcel* parcel, void* arrayData,
+                                      AParcel_byteArrayAllocator allocator);
+void AParcel_delete(AParcel* parcel);
+int32_t AParcel_getDataSize(const AParcel* parcel);
+binder_status_t AParcel_writeInt32(AParcel* parcel, int32_t value);
+binder_status_t AParcel_writeInt64(AParcel* parcel, int64_t value);
+binder_status_t AParcel_writeStrongBinder(AParcel* parcel, AIBinder* binder);
+binder_status_t AParcel_writeString(AParcel* parcel, const char* string,
+                                    int32_t length);
+binder_status_t AParcel_readInt32(const AParcel* parcel, int32_t* value);
+binder_status_t AParcel_readInt64(const AParcel* parcel, int64_t* value);
+binder_status_t AParcel_readString(const AParcel* parcel, void* stringData,
+                                   AParcel_stringAllocator allocator);
+binder_status_t AParcel_readStrongBinder(const AParcel* parcel,
+                                         AIBinder** binder);
+binder_status_t AParcel_writeByteArray(AParcel* parcel, const int8_t* arrayData,
+                                       int32_t length);
+binder_status_t AIBinder_prepareTransaction(AIBinder* binder, AParcel** in);
+jobject AIBinder_toJavaBinder(JNIEnv* env, AIBinder* binder);
+
+}  // namespace ndk_util
+
+}  // namespace grpc_binder
+
+#endif  // GPR_SUPPORT_BINDER_TRANSPORT
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
diff --git a/src/core/ext/transport/binder/wire_format/binder_constants.cc b/src/core/ext/transport/binder/wire_format/binder_constants.cc
new file mode 100644
index 00000000000..e9b2439fc64
--- /dev/null
+++ b/src/core/ext/transport/binder/wire_format/binder_constants.cc
@@ -0,0 +1,29 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/support/port_platform.h>
+
+#ifndef GRPC_NO_BINDER
+
+#include "src/core/ext/transport/binder/wire_format/binder_constants.h"
+
+ABSL_CONST_INIT const int FIRST_CALL_TRANSACTION = 0x00000001;
+ABSL_CONST_INIT const int LAST_CALL_TRANSACTION = 0x00FFFFFF;
+
+namespace grpc_binder {
+
+ABSL_CONST_INIT const int kFirstCallId = FIRST_CALL_TRANSACTION + 1000;
+
+}  // namespace grpc_binder
+#endif
diff --git a/src/core/ext/transport/binder/wire_format/transaction.cc b/src/core/ext/transport/binder/wire_format/transaction.cc
new file mode 100644
index 00000000000..9c3bb0225b6
--- /dev/null
+++ b/src/core/ext/transport/binder/wire_format/transaction.cc
@@ -0,0 +1,33 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/support/port_platform.h>
+
+#ifndef GRPC_NO_BINDER
+
+#include "src/core/ext/transport/binder/wire_format/transaction.h"
+
+namespace grpc_binder {
+
+ABSL_CONST_INIT const int kFlagPrefix = 0x1;
+ABSL_CONST_INIT const int kFlagMessageData = 0x2;
+ABSL_CONST_INIT const int kFlagSuffix = 0x4;
+ABSL_CONST_INIT const int kFlagOutOfBandClose = 0x8;
+ABSL_CONST_INIT const int kFlagExpectSingleMessage = 0x10;
+ABSL_CONST_INIT const int kFlagStatusDescription = 0x20;
+ABSL_CONST_INIT const int kFlagMessageDataIsParcelable = 0x40;
+ABSL_CONST_INIT const int kFlagMessageDataIsPartial = 0x80;
+
+}  // namespace grpc_binder
+#endif
diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc
index 4022d1f5735..0db484ac828 100644
--- a/src/core/plugin_registry/grpc_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_plugin_registry.cc
@@ -72,6 +72,9 @@ extern void RegisterLoadBalancedCallDestination(
 #ifndef GRPC_NO_RLS
 extern void RegisterRlsLbPolicy(CoreConfiguration::Builder* builder);
 #endif  // !GRPC_NO_RLS
+#ifdef GPR_SUPPORT_BINDER_TRANSPORT
+extern void RegisterBinderResolver(CoreConfiguration::Builder* builder);
+#endif
 
 namespace {
 
@@ -119,6 +122,9 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   RegisterFakeResolver(builder);
   RegisterHttpProxyMapper(builder);
   RegisterLoadBalancedCallDestination(builder);
+#ifdef GPR_SUPPORT_BINDER_TRANSPORT
+  RegisterBinderResolver(builder);
+#endif
 #ifndef GRPC_NO_RLS
   RegisterRlsLbPolicy(builder);
 #endif  // !GRPC_NO_RLS
diff --git a/src/core/resolver/binder/README.md b/src/core/resolver/binder/README.md
new file mode 100644
index 00000000000..b60296765d5
--- /dev/null
+++ b/src/core/resolver/binder/README.md
@@ -0,0 +1,9 @@
+Support for resolving the scheme used by binder transport implementation.
+
+The URI's authority is required to be empty.
+
+The path is used as the identifiers of endpoint binder objects and the length
+limit of the identifier is the same as unix socket length limit.
+
+The length limit of the path should at least be 100 characters long. This is
+guaranteed by `static_assert` in the implementation.
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index d8ca54d31be..e1bbd06531f 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -704,6 +704,7 @@ CORE_SOURCE_FILES = [
     'src/core/load_balancing/xds/xds_wrr_locality.cc',
     'src/core/plugin_registry/grpc_plugin_registry.cc',
     'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
+    'src/core/resolver/binder/binder_resolver.cc',
     'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
     'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
     'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
diff --git a/test/core/resolver/BUILD b/test/core/resolver/BUILD
index bf3e38a6f12..effbbac9dad 100644
--- a/test/core/resolver/BUILD
+++ b/test/core/resolver/BUILD
@@ -36,6 +36,22 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "binder_resolver_test",
+    srcs = ["binder_resolver_test.cc"],
+    external_deps = [
+        "absl/log:log",
+        "gtest",
+    ],
+    language = "C++",
+    deps = [
+        "//:gpr",
+        "//:grpc",
+        "//src/core:grpc_resolver_binder",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
 grpc_cc_test(
     name = "dns_resolver_test",
     srcs = ["dns_resolver_test.cc"],
diff --git a/test/core/transport/binder/BUILD b/test/core/transport/binder/BUILD
new file mode 100644
index 00000000000..1f7d3ebb9a0
--- /dev/null
+++ b/test/core/transport/binder/BUILD
@@ -0,0 +1,133 @@
+# Copyright 2021 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
+
+licenses(["notice"])
+
+grpc_package(
+    name = "test/core/transport/binder",
+    visibility = "tests",
+)
+
+grpc_cc_library(
+    name = "mock_objects",
+    testonly = 1,
+    srcs = ["mock_objects.cc"],
+    hdrs = ["mock_objects.h"],
+    external_deps = [
+        "absl/memory",
+        "gtest",
+    ],
+    language = "C++",
+    deps = [
+        "//:grpc++_binder",
+    ],
+)
+
+grpc_cc_test(
+    name = "wire_writer_test",
+    srcs = ["wire_writer_test.cc"],
+    external_deps = [
+        "absl/memory",
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        ":mock_objects",
+        "//:grpc++_binder",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
+grpc_cc_test(
+    name = "wire_reader_test",
+    srcs = ["wire_reader_test.cc"],
+    external_deps = [
+        "absl/memory",
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        ":mock_objects",
+        "//:grpc++_binder",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
+grpc_cc_test(
+    name = "transport_stream_receiver_test",
+    srcs = ["transport_stream_receiver_test.cc"],
+    external_deps = [
+        "absl/memory",
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:grpc++_binder",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
+grpc_cc_test(
+    name = "binder_transport_test",
+    srcs = ["binder_transport_test.cc"],
+    external_deps = [
+        "absl/memory",
+        "absl/strings",
+        "gtest",
+    ],
+    language = "C++",
+    tags = [
+        # To avoid `symbolizer buffer too small` warning of UBSAN
+        "noubsan",
+        "no_test_ios",
+    ],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        ":mock_objects",
+        "//:grpc",
+        "//:grpc++_binder",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
+grpc_cc_test(
+    name = "endpoint_binder_pool_test",
+    srcs = ["endpoint_binder_pool_test.cc"],
+    external_deps = [
+        "absl/memory",
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        ":mock_objects",
+        "//:grpc",
+        "//:grpc++_binder",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
diff --git a/test/core/transport/binder/end2end/BUILD b/test/core/transport/binder/end2end/BUILD
new file mode 100644
index 00000000000..4e9ee2fe2d2
--- /dev/null
+++ b/test/core/transport/binder/end2end/BUILD
@@ -0,0 +1,119 @@
+# Copyright 2021 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
+
+licenses(["notice"])
+
+grpc_package(
+    name = "test/core/transport/binder/end2end",
+    visibility = "tests",
+)
+
+grpc_cc_library(
+    name = "fake_binder",
+    testonly = 1,
+    srcs = ["fake_binder.cc"],
+    hdrs = ["fake_binder.h"],
+    external_deps = [
+        "absl/log:log",
+        "absl/memory",
+        "absl/random",
+        "absl/strings",
+        "absl/strings:str_format",
+        "absl/time",
+        "absl/types:variant",
+    ],
+    deps = [
+        "//:gpr",
+        "//:grpc++_binder",
+    ],
+)
+
+grpc_cc_test(
+    name = "fake_binder_test",
+    srcs = ["fake_binder_test.cc"],
+    external_deps = [
+        "absl/strings",
+        "absl/time",
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        ":fake_binder",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
+grpc_cc_library(
+    name = "end2end_binder_channel",
+    testonly = 1,
+    srcs = ["testing_channel_create.cc"],
+    hdrs = ["testing_channel_create.h"],
+    external_deps = ["absl/log:check"],
+    deps = [
+        ":fake_binder",
+        "//:grpc++_base",
+        "//:grpc++_binder",
+        "//:grpc_base",
+        "//src/core:channel_args",
+    ],
+)
+
+grpc_cc_test(
+    name = "end2end_binder_transport_test",
+    srcs = ["end2end_binder_transport_test.cc"],
+    external_deps = [
+        "absl/memory",
+        "absl/time",
+        "gtest",
+    ],
+    flaky = True,
+    language = "C++",
+    tags = [
+        # Flaky on windows
+        "no_windows",
+        "no_mac",
+        "no_test_ios",
+
+        # Known race between stream creation and cancellation
+        "notsan",
+    ],
+    deps = [
+        ":end2end_binder_channel",
+        ":fake_binder",
+        "//:grpc++_binder",
+        "//test/core/test_util:grpc_test_util",
+        "//test/cpp/end2end:test_service_impl",
+    ],
+)
+
+grpc_cc_test(
+    name = "binder_server_test",
+    srcs = ["binder_server_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
+    tags = ["no_test_ios"],
+    deps = [
+        "//:grpc++",
+        "//:grpc++_binder",
+        "//test/core/test_util:grpc_test_util",
+        "//test/core/transport/binder/end2end:fake_binder",
+        "//test/cpp/end2end:test_service_impl",
+    ],
+)
diff --git a/test/core/transport/binder/end2end/fuzzers/BUILD b/test/core/transport/binder/end2end/fuzzers/BUILD
new file mode 100644
index 00000000000..a0184afd3cb
--- /dev/null
+++ b/test/core/transport/binder/end2end/fuzzers/BUILD
@@ -0,0 +1,101 @@
+# Copyright 2021 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_package", "grpc_proto_library")
+load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
+
+grpc_package(
+    name = "test/core/transport/binder/end2end/fuzzers",
+    features = [
+        "layering_check",
+    ],
+)
+
+licenses(["notice"])
+
+# Protobuf messages for generating inputs. We manually define proto
+# library rule here so the same proto file can be shared between multiple
+# grpc_proto_fuzzer targets
+grpc_proto_library(
+    name = "binder_transport_fuzzer_proto",
+    srcs = ["binder_transport_fuzzer.proto"],
+)
+
+grpc_cc_library(
+    name = "fuzzer_utils",
+    srcs = ["fuzzer_utils.cc"],
+    external_deps = [
+        "absl/log:check",
+        "absl/log:log",
+    ],
+    language = "c++",
+    public_hdrs = ["fuzzer_utils.h"],
+    deps = [
+        "binder_transport_fuzzer_proto",
+        "//:gpr",
+        "//:grpc++",
+        "//:grpc++_base",
+        "//:grpc_base",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
+grpc_proto_fuzzer(
+    name = "binder_transport_client_fuzzer",
+    srcs = [
+        "client_fuzzer.cc",
+    ],
+    corpus = "binder_transport_client_fuzzer_corpus",
+    external_deps = ["absl/log:check"],
+    owner = "binder",
+    proto = "client.proto",
+    tags = [
+        "no_mac",
+        "no_windows",
+    ],
+    deps = [
+        "binder_transport_fuzzer_proto",
+        ":fuzzer_utils",
+        "//:gpr",
+        "//:grpc++",
+        "//:grpc++_base",
+        "//:grpc_base",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
+
+grpc_proto_fuzzer(
+    name = "binder_transport_server_fuzzer",
+    srcs = [
+        "server_fuzzer.cc",
+    ],
+    corpus = "binder_transport_server_fuzzer_corpus",
+    external_deps = ["absl/log:check"],
+    owner = "binder",
+    proto = "server.proto",
+    tags = [
+        "no_mac",
+        "no_windows",
+    ],
+    deps = [
+        "binder_transport_fuzzer_proto",
+        ":fuzzer_utils",
+        "//:gpr",
+        "//:grpc++",
+        "//:grpc++_base",
+        "//:grpc_base",
+        "//src/core:slice",
+        "//test/core/test_util:grpc_test_util",
+    ],
+)
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty b/test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto b/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
new file mode 100644
index 00000000000..8fb2aa3edd1
--- /dev/null
+++ b/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
@@ -0,0 +1,81 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package binder_transport_fuzzer;
+
+message Binder {}
+
+message Value {
+  oneof data_type {
+    int32 i32 = 1;
+    int64 i64 = 2;
+    bytes byte_array = 3;
+    // Strings in Parcel could also contain non UTF-8 data so we use bytes
+    // to represent string here
+    bytes str = 4;
+    Binder binder = 5;
+  }
+}
+
+message Parcel {
+  repeated Value values = 1;
+
+  // Simulates the return value of AParcel_getDataSize
+  // (The value generated by protobuf libprotobuf-mutator might not always make sense
+  // but the transport implementation should handle that)
+  int32 data_size = 2;
+}
+
+enum TransactionCode {
+  INVALID = 0;
+  SETUP_TRANSPORT = 1;
+  SHUTDOWN_TRANSPORT = 2;
+  ACKNOWLEDGE_BYTES = 3;
+  PING = 4;
+  PING_RESPONSE = 5;
+}
+
+message Transaction {
+  TransactionCode code = 1;
+  int32 uid = 2;
+  Parcel parcel = 3;
+}
+
+// Special parcel that used for setting up transport.
+// TODO(mingcl): Consider also fuzzing the setup transport code path
+message SetupTransportParcel {
+  int32 version = 1;
+
+  // Simulates the return value of AParcel_getDataSize
+  // (The value generated by protobuf libprotobuf-mutator might not always make sense
+  // but the transport implementation should handle that)
+  int32 data_size = 2;
+}
+
+message SetupTransportTransaction {
+  int32 uid = 1;
+  SetupTransportParcel parcel = 2;
+}
+
+message IncomingParcels {
+  SetupTransportTransaction setup_transport_transaction = 1;
+  repeated Transaction transactions = 2;
+}
+
+message Input {
+  IncomingParcels incoming_parcels = 1;
+}
+
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty b/test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/core/transport/binder/end2end/fuzzers/client.proto b/test/core/transport/binder/end2end/fuzzers/client.proto
new file mode 100644
index 00000000000..4fe133a7d24
--- /dev/null
+++ b/test/core/transport/binder/end2end/fuzzers/client.proto
@@ -0,0 +1,17 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package binder_transport_fuzzer;
diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
new file mode 100644
index 00000000000..11609ac92f8
--- /dev/null
+++ b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
@@ -0,0 +1,157 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h"
+
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+
+namespace grpc_binder {
+namespace fuzzing {
+
+namespace {
+
+std::thread* g_fuzzing_thread = nullptr;
+
+template <typename... Args>
+void CreateFuzzingThread(Args&&... args) {
+  CHECK_EQ(g_fuzzing_thread, nullptr);
+  g_fuzzing_thread = new std::thread(std::forward<Args>(args)...);
+}
+
+}  // namespace
+
+void JoinFuzzingThread() {
+  if (g_fuzzing_thread) {
+    g_fuzzing_thread->join();
+    delete g_fuzzing_thread;
+    g_fuzzing_thread = nullptr;
+  }
+}
+
+int32_t ReadableParcelForFuzzing::GetDataSize() const {
+  return parcel_data_size_;
+}
+
+absl::Status ReadableParcelForFuzzing::ReadInt32(int32_t* data) {
+  if (consumed_data_size_ >= kParcelDataSizeLimit) {
+    return absl::InternalError("Parcel size limit exceeds");
+  }
+  if (values_.empty() || !values_.front().has_i32()) {
+    return absl::InternalError("error");
+  }
+  *data = values_.front().i32();
+  values_.pop();
+  consumed_data_size_ += sizeof(int32_t);
+  return absl::OkStatus();
+}
+
+absl::Status ReadableParcelForFuzzing::ReadInt64(int64_t* data) {
+  if (consumed_data_size_ >= kParcelDataSizeLimit) {
+    return absl::InternalError("Parcel size limit exceeds");
+  }
+  if (values_.empty() || !values_.front().has_i64()) {
+    return absl::InternalError("error");
+  }
+  *data = values_.front().i64();
+  values_.pop();
+  consumed_data_size_ += sizeof(int64_t);
+  return absl::OkStatus();
+}
+
+absl::Status ReadableParcelForFuzzing::ReadBinder(
+    std::unique_ptr<Binder>* binder) {
+  if (consumed_data_size_ >= kParcelDataSizeLimit) {
+    return absl::InternalError("Parcel size limit exceeds");
+  }
+  if (values_.empty() || !values_.front().has_binder()) {
+    return absl::InternalError("error");
+  }
+  *binder = std::make_unique<BinderForFuzzing>();
+  values_.pop();
+  consumed_data_size_ += sizeof(void*);
+  return absl::OkStatus();
+}
+
+absl::Status ReadableParcelForFuzzing::ReadByteArray(std::string* data) {
+  if (consumed_data_size_ >= kParcelDataSizeLimit) {
+    return absl::InternalError("Parcel size limit exceeds");
+  }
+  if (values_.empty() || !values_.front().has_byte_array()) {
+    return absl::InternalError("error");
+  }
+  *data = values_.front().byte_array();
+  values_.pop();
+  consumed_data_size_ += data->size();
+  return absl::OkStatus();
+}
+
+absl::Status ReadableParcelForFuzzing::ReadString(std::string* data) {
+  if (consumed_data_size_ >= kParcelDataSizeLimit) {
+    return absl::InternalError("Parcel size limit exceeds");
+  }
+  if (values_.empty() || !values_.front().has_str()) {
+    return absl::InternalError("error");
+  }
+  *data = values_.front().str();
+  values_.pop();
+  consumed_data_size_ += data->size();
+  return absl::OkStatus();
+}
+
+void FuzzingLoop(
+    binder_transport_fuzzer::IncomingParcels incoming_parcels,
+    grpc_core::RefCountedPtr<grpc_binder::WireReader> wire_reader_ref,
+    grpc_binder::TransactionReceiver::OnTransactCb callback) {
+  {
+    // Send SETUP_TRANSPORT request.
+    std::unique_ptr<grpc_binder::ReadableParcel> parcel =
+        std::make_unique<ReadableParcelForFuzzing>(
+            incoming_parcels.setup_transport_transaction().parcel());
+    callback(static_cast<transaction_code_t>(
+                 grpc_binder::BinderTransportTxCode::SETUP_TRANSPORT),
+             parcel.get(),
+             /*uid=*/incoming_parcels.setup_transport_transaction().uid())
+        .IgnoreError();
+  }
+  for (const auto& tx_iter : incoming_parcels.transactions()) {
+    transaction_code_t tx_code = tx_iter.code();
+    std::unique_ptr<grpc_binder::ReadableParcel> parcel =
+        std::make_unique<ReadableParcelForFuzzing>(tx_iter.parcel());
+    callback(tx_code, parcel.get(),
+             /*uid=*/tx_iter.uid())
+        .IgnoreError();
+  }
+  wire_reader_ref = nullptr;
+}
+
+TransactionReceiverForFuzzing::TransactionReceiverForFuzzing(
+    binder_transport_fuzzer::IncomingParcels incoming_parcels,
+    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
+    TransactionReceiver::OnTransactCb cb) {
+  LOG(INFO) << "Construct TransactionReceiverForFuzzing";
+  CreateFuzzingThread(FuzzingLoop, std::move(incoming_parcels),
+                      std::move(wire_reader_ref), std::move(cb));
+}
+
+std::unique_ptr<TransactionReceiver> BinderForFuzzing::ConstructTxReceiver(
+    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
+    TransactionReceiver::OnTransactCb cb) const {
+  auto tx_receiver = std::make_unique<TransactionReceiverForFuzzing>(
+      incoming_parcels_, wire_reader_ref, cb);
+  return tx_receiver;
+}
+
+}  // namespace fuzzing
+}  // namespace grpc_binder
diff --git a/test/core/transport/binder/end2end/fuzzers/server.proto b/test/core/transport/binder/end2end/fuzzers/server.proto
new file mode 100644
index 00000000000..4fe133a7d24
--- /dev/null
+++ b/test/core/transport/binder/end2end/fuzzers/server.proto
@@ -0,0 +1,17 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package binder_transport_fuzzer;
diff --git a/test/core/transport/binder/mock_objects.cc b/test/core/transport/binder/mock_objects.cc
new file mode 100644
index 00000000000..7e173ef15ad
--- /dev/null
+++ b/test/core/transport/binder/mock_objects.cc
@@ -0,0 +1,55 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "test/core/transport/binder/mock_objects.h"
+
+#include <memory>
+
+#include "absl/memory/memory.h"
+
+namespace grpc_binder {
+
+using ::testing::Return;
+
+MockReadableParcel::MockReadableParcel() {
+  ON_CALL(*this, ReadBinder).WillByDefault([](std::unique_ptr<Binder>* binder) {
+    *binder = std::make_unique<MockBinder>();
+    return absl::OkStatus();
+  });
+  ON_CALL(*this, ReadInt32).WillByDefault(Return(absl::OkStatus()));
+  ON_CALL(*this, ReadByteArray).WillByDefault(Return(absl::OkStatus()));
+  ON_CALL(*this, ReadString).WillByDefault(Return(absl::OkStatus()));
+}
+
+MockWritableParcel::MockWritableParcel() {
+  ON_CALL(*this, WriteInt32).WillByDefault(Return(absl::OkStatus()));
+  ON_CALL(*this, WriteBinder).WillByDefault(Return(absl::OkStatus()));
+  ON_CALL(*this, WriteString).WillByDefault(Return(absl::OkStatus()));
+  ON_CALL(*this, WriteByteArray).WillByDefault(Return(absl::OkStatus()));
+}
+
+MockBinder::MockBinder() {
+  ON_CALL(*this, PrepareTransaction).WillByDefault(Return(absl::OkStatus()));
+  ON_CALL(*this, Transact).WillByDefault(Return(absl::OkStatus()));
+  ON_CALL(*this, GetWritableParcel).WillByDefault(Return(&mock_input_));
+  ON_CALL(*this, ConstructTxReceiver)
+      .WillByDefault(
+          [this](grpc_core::RefCountedPtr<WireReader> /*wire_reader_ref*/,
+                 TransactionReceiver::OnTransactCb cb) {
+            return std::make_unique<MockTransactionReceiver>(
+                cb, BinderTransportTxCode::SETUP_TRANSPORT, &mock_output_);
+          });
+}
+
+}  // namespace grpc_binder
diff --git a/test/core/transport/binder/mock_objects.h b/test/core/transport/binder/mock_objects.h
new file mode 100644
index 00000000000..6424a2acd22
--- /dev/null
+++ b/test/core/transport/binder/mock_objects.h
@@ -0,0 +1,121 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
+#define GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
+
+#include <gmock/gmock.h>
+
+#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
+#include "src/core/ext/transport/binder/wire_format/binder.h"
+#include "src/core/ext/transport/binder/wire_format/binder_constants.h"
+#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
+#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
+
+namespace grpc_binder {
+
+class MockWritableParcel : public WritableParcel {
+ public:
+  MOCK_METHOD(int32_t, GetDataSize, (), (const, override));
+  MOCK_METHOD(absl::Status, WriteInt32, (int32_t), (override));
+  MOCK_METHOD(absl::Status, WriteInt64, (int64_t), (override));
+  MOCK_METHOD(absl::Status, WriteBinder, (HasRawBinder*), (override));
+  MOCK_METHOD(absl::Status, WriteString, (absl::string_view), (override));
+  MOCK_METHOD(absl::Status, WriteByteArray, (const int8_t*, int32_t),
+              (override));
+
+  MockWritableParcel();
+};
+
+class MockReadableParcel : public ReadableParcel {
+ public:
+  MOCK_METHOD(int32_t, GetDataSize, (), (const, override));
+  MOCK_METHOD(absl::Status, ReadInt32, (int32_t*), (override));
+  MOCK_METHOD(absl::Status, ReadInt64, (int64_t*), (override));
+  MOCK_METHOD(absl::Status, ReadBinder, (std::unique_ptr<Binder>*), (override));
+  MOCK_METHOD(absl::Status, ReadByteArray, (std::string*), (override));
+  MOCK_METHOD(absl::Status, ReadString, (std::string*), (override));
+
+  MockReadableParcel();
+};
+
+class MockBinder : public Binder {
+ public:
+  MOCK_METHOD(void, Initialize, (), (override));
+  MOCK_METHOD(absl::Status, PrepareTransaction, (), (override));
+  MOCK_METHOD(absl::Status, Transact, (BinderTransportTxCode), (override));
+  MOCK_METHOD(WritableParcel*, GetWritableParcel, (), (const, override));
+  MOCK_METHOD(std::unique_ptr<TransactionReceiver>, ConstructTxReceiver,
+              (grpc_core::RefCountedPtr<WireReader>,
+               TransactionReceiver::OnTransactCb),
+              (const, override));
+  MOCK_METHOD(void*, GetRawBinder, (), (override));
+
+  MockBinder();
+  MockWritableParcel& GetWriter() { return mock_input_; }
+  MockReadableParcel& GetReader() { return mock_output_; }
+
+ private:
+  MockWritableParcel mock_input_;
+  MockReadableParcel mock_output_;
+};
+
+// TODO(waynetu): Implement transaction injection later for more thorough
+// testing.
+class MockTransactionReceiver : public TransactionReceiver {
+ public:
+  explicit MockTransactionReceiver(OnTransactCb transact_cb,
+                                   BinderTransportTxCode code,
+                                   MockReadableParcel* output) {
+    if (code == BinderTransportTxCode::SETUP_TRANSPORT) {
+      EXPECT_CALL(*output, ReadInt32).WillOnce([](int32_t* version) {
+        *version = 1;
+        return absl::OkStatus();
+      });
+    }
+    transact_cb(static_cast<transaction_code_t>(code), output, /*uid=*/0)
+        .IgnoreError();
+  }
+
+  MOCK_METHOD(void*, GetRawBinder, (), (override));
+};
+
+class MockWireWriter : public WireWriter {
+ public:
+  MOCK_METHOD(absl::Status, RpcCall, (std::unique_ptr<Transaction>),
+              (override));
+  MOCK_METHOD(absl::Status, SendAck, (int64_t), (override));
+  MOCK_METHOD(void, OnAckReceived, (int64_t), (override));
+};
+
+class MockTransportStreamReceiver : public TransportStreamReceiver {
+ public:
+  MOCK_METHOD(void, RegisterRecvInitialMetadata,
+              (StreamIdentifier, InitialMetadataCallbackType), (override));
+  MOCK_METHOD(void, RegisterRecvMessage,
+              (StreamIdentifier, MessageDataCallbackType), (override));
+  MOCK_METHOD(void, RegisterRecvTrailingMetadata,
+              (StreamIdentifier, TrailingMetadataCallbackType), (override));
+  MOCK_METHOD(void, NotifyRecvInitialMetadata,
+              (StreamIdentifier, absl::StatusOr<Metadata>), (override));
+  MOCK_METHOD(void, NotifyRecvMessage,
+              (StreamIdentifier, absl::StatusOr<std::string>), (override));
+  MOCK_METHOD(void, NotifyRecvTrailingMetadata,
+              (StreamIdentifier, absl::StatusOr<Metadata>, int), (override));
+  MOCK_METHOD(void, CancelStream, (StreamIdentifier), (override));
+};
+
+}  // namespace grpc_binder
+
+#endif  // GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index e79c61376ab..396a70209f2 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -960,6 +960,7 @@ include/grpcpp/channel.h \
 include/grpcpp/client_context.h \
 include/grpcpp/completion_queue.h \
 include/grpcpp/create_channel.h \
+include/grpcpp/create_channel_binder.h \
 include/grpcpp/create_channel_posix.h \
 include/grpcpp/ext/call_metric_recorder.h \
 include/grpcpp/ext/health_check_service_server_builder_option.h \
@@ -1051,6 +1052,8 @@ include/grpcpp/security/audit_logging.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/authorization_policy_provider.h \
+include/grpcpp/security/binder_credentials.h \
+include/grpcpp/security/binder_security_policy.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/tls_certificate_provider.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 3c732935f0c..4147fafc791 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -960,6 +960,7 @@ include/grpcpp/channel.h \
 include/grpcpp/client_context.h \
 include/grpcpp/completion_queue.h \
 include/grpcpp/create_channel.h \
+include/grpcpp/create_channel_binder.h \
 include/grpcpp/create_channel_posix.h \
 include/grpcpp/ext/call_metric_recorder.h \
 include/grpcpp/ext/health_check_service_server_builder_option.h \
@@ -1051,6 +1052,8 @@ include/grpcpp/security/audit_logging.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/authorization_policy_provider.h \
+include/grpcpp/security/binder_credentials.h \
+include/grpcpp/security/binder_security_policy.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/tls_certificate_provider.h \
@@ -1170,6 +1173,44 @@ src/core/ext/filters/stateful_session/stateful_session_filter.cc \
 src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h \
+src/core/ext/transport/binder/client/binder_connector.cc \
+src/core/ext/transport/binder/client/binder_connector.h \
+src/core/ext/transport/binder/client/channel_create.cc \
+src/core/ext/transport/binder/client/channel_create_impl.cc \
+src/core/ext/transport/binder/client/channel_create_impl.h \
+src/core/ext/transport/binder/client/connection_id_generator.cc \
+src/core/ext/transport/binder/client/connection_id_generator.h \
+src/core/ext/transport/binder/client/endpoint_binder_pool.cc \
+src/core/ext/transport/binder/client/endpoint_binder_pool.h \
+src/core/ext/transport/binder/client/jni_utils.cc \
+src/core/ext/transport/binder/client/jni_utils.h \
+src/core/ext/transport/binder/client/security_policy_setting.cc \
+src/core/ext/transport/binder/client/security_policy_setting.h \
+src/core/ext/transport/binder/security_policy/binder_security_policy.cc \
+src/core/ext/transport/binder/server/binder_server.cc \
+src/core/ext/transport/binder/server/binder_server.h \
+src/core/ext/transport/binder/server/binder_server_credentials.cc \
+src/core/ext/transport/binder/transport/binder_stream.h \
+src/core/ext/transport/binder/transport/binder_transport.cc \
+src/core/ext/transport/binder/transport/binder_transport.h \
+src/core/ext/transport/binder/utils/binder_auto_utils.h \
+src/core/ext/transport/binder/utils/ndk_binder.cc \
+src/core/ext/transport/binder/utils/ndk_binder.h \
+src/core/ext/transport/binder/utils/transport_stream_receiver.h \
+src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc \
+src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h \
+src/core/ext/transport/binder/wire_format/binder.h \
+src/core/ext/transport/binder/wire_format/binder_android.cc \
+src/core/ext/transport/binder/wire_format/binder_android.h \
+src/core/ext/transport/binder/wire_format/binder_constants.cc \
+src/core/ext/transport/binder/wire_format/binder_constants.h \
+src/core/ext/transport/binder/wire_format/transaction.cc \
+src/core/ext/transport/binder/wire_format/transaction.h \
+src/core/ext/transport/binder/wire_format/wire_reader.h \
+src/core/ext/transport/binder/wire_format/wire_reader_impl.cc \
+src/core/ext/transport/binder/wire_format/wire_reader_impl.h \
+src/core/ext/transport/binder/wire_format/wire_writer.cc \
+src/core/ext/transport/binder/wire_format/wire_writer.h \
 src/core/ext/transport/chttp2/alpn/alpn.cc \
 src/core/ext/transport/chttp2/alpn/alpn.h \
 src/core/ext/transport/chttp2/client/chttp2_connector.cc \
@@ -2668,6 +2709,7 @@ src/core/load_balancing/xds/xds_override_host.h \
 src/core/load_balancing/xds/xds_wrr_locality.cc \
 src/core/plugin_registry/grpc_plugin_registry.cc \
 src/core/plugin_registry/grpc_plugin_registry_extra.cc \
+src/core/resolver/binder/binder_resolver.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.h \
 src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index ae593862758..cf962517d9e 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -975,6 +975,7 @@ src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h \
 src/core/ext/transport/README.md \
+src/core/ext/transport/binder/README.md \
 src/core/ext/transport/chttp2/README.md \
 src/core/ext/transport/chttp2/alpn/alpn.cc \
 src/core/ext/transport/chttp2/alpn/alpn.h \
@@ -2481,6 +2482,8 @@ src/core/load_balancing/xds/xds_wrr_locality.cc \
 src/core/plugin_registry/grpc_plugin_registry.cc \
 src/core/plugin_registry/grpc_plugin_registry_extra.cc \
 src/core/resolver/README.md \
+src/core/resolver/binder/README.md \
+src/core/resolver/binder/binder_resolver.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.h \
 src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
diff --git a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
new file mode 100755
index 00000000000..300cace3a37
--- /dev/null
+++ b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Copyright 2021 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+echo $ANDROID_HOME
+echo $ANDROID_NDK_HOME
+
+# Android platforms only works with Bazel >= 7.0
+export OVERRIDE_BAZEL_VERSION=7.3.1
+
+python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_binder_example_app
+bazel_binder_example_app/bazel_wrapper \
+  --bazelrc=tools/remote_build/include/test_locally_with_resultstore_results.bazelrc \
+  build \
+  --extra_toolchains=@androidndk//:all \
+  --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \
+  //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app \
+  //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app
+
+# Make sure the Java code that will be invoked by binder transport
+# implementation builds
+python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_binder_connection_helper
+bazel_binder_connection_helper/bazel_wrapper \
+  --bazelrc=tools/remote_build/include/test_locally_with_resultstore_results.bazelrc \
+  build \
+  --define=use_strict_warning=true \
+  @binder_transport_android_helper//io/grpc/binder/cpp:connection_helper
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 46054ee4dea..991313c58b5 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -1065,6 +1065,78 @@
     ],
     "uses_polling": true
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "binder_resolver_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": true
+  },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "binder_server_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": true
+  },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "binder_transport_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -3123,6 +3195,30 @@
     ],
     "uses_polling": false
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "endpoint_binder_pool_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -3479,6 +3575,30 @@
     ],
     "uses_polling": true
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "fake_binder_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -11323,6 +11443,30 @@
     ],
     "uses_polling": true
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "transport_stream_receiver_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -11749,6 +11893,54 @@
     ],
     "uses_polling": false
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "wire_reader_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "wire_writer_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,

From e8aa408bba78552d995ec8d953690b42712c808b Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 9 Oct 2024 11:15:38 -0700
Subject: [PATCH 46/74] [chaotic-good] Fix some ref leaks (#37865)

1. Simplify refcounting in the server by not keeping a reference to a call around when it's not necessary
2. Handle the case that we get a NewStream on the server transport after the transport is closed
3. If a call is cancelled whilst matching in the server, ensure that we clean that up

Closes #37865

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37865 from ctiller:flake-fightas-16 b3dfc1e9b1b5b93f16c368904a2d74b0273df69a
PiperOrigin-RevId: 684105108
---
 .../chaotic_good/server_transport.cc          |  88 +++++++--------
 .../transport/chaotic_good/server_transport.h |   4 +-
 src/core/server/server.cc                     | 103 +++++++++---------
 3 files changed, 100 insertions(+), 95 deletions(-)

diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index b166d79380f..42c2ddb501e 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -125,14 +125,13 @@ auto ChaoticGoodServerTransport::MaybePushFragmentIntoCall(
 }
 
 auto ChaoticGoodServerTransport::SendFragment(
-    ServerFragmentFrame frame, MpscSender<ServerFrame> outgoing_frames,
-    CallInitiator call_initiator) {
+    ServerFragmentFrame frame, MpscSender<ServerFrame> outgoing_frames) {
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD: SendFragment: frame=" << frame.ToString();
   // Capture the call_initiator to ensure the underlying call spine is alive
   // until the outgoing_frames.Send promise completes.
   return Map(outgoing_frames.Send(std::move(frame)),
-             [call_initiator](bool success) -> absl::Status {
+             [](bool success) -> absl::Status {
                if (!success) {
                  // Failed to send outgoing frame.
                  return absl::UnavailableError("Transport closed.");
@@ -146,27 +145,26 @@ auto ChaoticGoodServerTransport::SendCallBody(
     CallInitiator call_initiator) {
   // Continuously send client frame with client to server
   // messages.
-  return ForEach(
-      OutgoingMessages(call_initiator),
-      // Capture the call_initator to ensure the underlying call
-      // spine is alive until the SendFragment promise completes.
-      [stream_id, outgoing_frames, call_initiator,
-       aligned_bytes = aligned_bytes_](MessageHandle message) mutable {
-        ServerFragmentFrame frame;
-        // Construct frame header (flags, header_length
-        // and trailer_length will be added in
-        // serialization).
-        const uint32_t message_length = message->payload()->Length();
-        const uint32_t padding =
-            message_length % aligned_bytes == 0
-                ? 0
-                : aligned_bytes - message_length % aligned_bytes;
-        CHECK_EQ((message_length + padding) % aligned_bytes, 0u);
-        frame.message =
-            FragmentMessage(std::move(message), padding, message_length);
-        frame.stream_id = stream_id;
-        return SendFragment(std::move(frame), outgoing_frames, call_initiator);
-      });
+  return ForEach(OutgoingMessages(call_initiator),
+                 // Capture the call_initator to ensure the underlying call
+                 // spine is alive until the SendFragment promise completes.
+                 [stream_id, outgoing_frames, aligned_bytes = aligned_bytes_](
+                     MessageHandle message) mutable {
+                   ServerFragmentFrame frame;
+                   // Construct frame header (flags, header_length
+                   // and trailer_length will be added in
+                   // serialization).
+                   const uint32_t message_length = message->payload()->Length();
+                   const uint32_t padding =
+                       message_length % aligned_bytes == 0
+                           ? 0
+                           : aligned_bytes - (message_length % aligned_bytes);
+                   CHECK_EQ((message_length + padding) % aligned_bytes, 0u);
+                   frame.message = FragmentMessage(std::move(message), padding,
+                                                   message_length);
+                   frame.stream_id = stream_id;
+                   return SendFragment(std::move(frame), outgoing_frames);
+                 });
 }
 
 auto ChaoticGoodServerTransport::SendCallInitialMetadataAndBody(
@@ -187,8 +185,7 @@ auto ChaoticGoodServerTransport::SendCallInitialMetadataAndBody(
               frame.headers = std::move(*md);
               frame.stream_id = stream_id;
               return TrySeq(
-                  SendFragment(std::move(frame), outgoing_frames,
-                               call_initiator),
+                  SendFragment(std::move(frame), outgoing_frames),
                   SendCallBody(stream_id, outgoing_frames, call_initiator));
             },
             []() { return absl::OkStatus(); });
@@ -209,15 +206,11 @@ auto ChaoticGoodServerTransport::CallOutboundLoop(
                 return Empty{};
               }),
           call_initiator.PullServerTrailingMetadata(),
-          // Capture the call_initator to ensure the underlying call_spine
-          // is alive until the SendFragment promise completes.
-          [stream_id, outgoing_frames,
-           call_initiator](ServerMetadataHandle md) mutable {
+          [stream_id, outgoing_frames](ServerMetadataHandle md) mutable {
             ServerFragmentFrame frame;
             frame.trailers = std::move(md);
             frame.stream_id = stream_id;
-            return SendFragment(std::move(frame), outgoing_frames,
-                                call_initiator);
+            return SendFragment(std::move(frame), outgoing_frames);
           }));
 }
 
@@ -309,10 +302,11 @@ auto ChaoticGoodServerTransport::ReadOneFrame(ChaoticGoodTransport& transport) {
                            call_initiator.has_value(),
                            [&call_initiator]() {
                              auto c = std::move(*call_initiator);
-                             return c.SpawnWaitable("cancel", [c]() mutable {
-                               c.Cancel();
-                               return absl::OkStatus();
-                             });
+                             return c.SpawnWaitable("cancel_from_read",
+                                                    [c]() mutable {
+                                                      c.Cancel();
+                                                      return absl::OkStatus();
+                                                    });
                            },
                            []() -> absl::Status { return absl::OkStatus(); });
                      }),
@@ -397,6 +391,8 @@ void ChaoticGoodServerTransport::AbortWithError() {
   // Close all the available pipes.
   outgoing_frames_.MarkClosed();
   ReleasableMutexLock lock(&mu_);
+  if (aborted_with_error_) return;
+  aborted_with_error_ = true;
   StreamMap stream_map = std::move(stream_map_);
   stream_map_.clear();
   state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN,
@@ -405,18 +401,19 @@ void ChaoticGoodServerTransport::AbortWithError() {
   lock.Release();
   for (const auto& pair : stream_map) {
     auto call_initiator = pair.second;
-    call_initiator.SpawnInfallible("cancel", [call_initiator]() mutable {
-      call_initiator.Cancel();
-      return Empty{};
-    });
+    call_initiator.SpawnInfallible("cancel_from_transport_closed",
+                                   [call_initiator]() mutable {
+                                     call_initiator.Cancel();
+                                     return Empty{};
+                                   });
   }
 }
 
 absl::optional<CallInitiator> ChaoticGoodServerTransport::LookupStream(
     uint32_t stream_id) {
+  MutexLock lock(&mu_);
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD " << this << " LookupStream " << stream_id;
-  MutexLock lock(&mu_);
   auto it = stream_map_.find(stream_id);
   if (it == stream_map_.end()) return absl::nullopt;
   return it->second;
@@ -424,9 +421,9 @@ absl::optional<CallInitiator> ChaoticGoodServerTransport::LookupStream(
 
 absl::optional<CallInitiator> ChaoticGoodServerTransport::ExtractStream(
     uint32_t stream_id) {
+  MutexLock lock(&mu_);
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD " << this << " ExtractStream " << stream_id;
-  MutexLock lock(&mu_);
   auto it = stream_map_.find(stream_id);
   if (it == stream_map_.end()) return absl::nullopt;
   auto r = std::move(it->second);
@@ -436,9 +433,12 @@ absl::optional<CallInitiator> ChaoticGoodServerTransport::ExtractStream(
 
 absl::Status ChaoticGoodServerTransport::NewStream(
     uint32_t stream_id, CallInitiator call_initiator) {
+  MutexLock lock(&mu_);
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD " << this << " NewStream " << stream_id;
-  MutexLock lock(&mu_);
+  if (aborted_with_error_) {
+    return absl::UnavailableError("Transport closed");
+  }
   auto it = stream_map_.find(stream_id);
   if (it != stream_map_.end()) {
     return absl::InternalError("Stream already exists");
@@ -454,7 +454,7 @@ absl::Status ChaoticGoodServerTransport::NewStream(
             self->ExtractStream(stream_id);
         if (call_initiator.has_value()) {
           auto c = std::move(*call_initiator);
-          c.SpawnInfallible("cancel", [c]() mutable {
+          c.SpawnInfallible("cancel_from_on_done", [c]() mutable {
             c.Cancel();
             return Empty{};
           });
diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h
index 49fd5ae015f..65929533f68 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.h
+++ b/src/core/ext/transport/chaotic_good/server_transport.h
@@ -109,8 +109,7 @@ class ChaoticGoodServerTransport final : public ServerTransport {
   auto SendCallBody(uint32_t stream_id, MpscSender<ServerFrame> outgoing_frames,
                     CallInitiator call_initiator);
   static auto SendFragment(ServerFragmentFrame frame,
-                           MpscSender<ServerFrame> outgoing_frames,
-                           CallInitiator call_initiator);
+                           MpscSender<ServerFrame> outgoing_frames);
   auto CallOutboundLoop(uint32_t stream_id, CallInitiator call_initiator);
   auto OnTransportActivityDone(absl::string_view activity);
   auto TransportReadLoop(RefCountedPtr<ChaoticGoodTransport> transport);
@@ -144,6 +143,7 @@ class ChaoticGoodServerTransport final : public ServerTransport {
   // Map of stream incoming server frames, key is stream_id.
   StreamMap stream_map_ ABSL_GUARDED_BY(mu_);
   uint32_t last_seen_new_stream_id_ = 0;
+  bool aborted_with_error_ ABSL_GUARDED_BY(mu_) = false;
   RefCountedPtr<Party> party_;
   ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(mu_){
       "chaotic_good_server", GRPC_CHANNEL_READY};
diff --git a/src/core/server/server.cc b/src/core/server/server.cc
index 5ec784a5c96..87bb72a0dee 100644
--- a/src/core/server/server.cc
+++ b/src/core/server/server.cc
@@ -813,55 +813,60 @@ absl::StatusOr<ClientMetadataHandle> CheckClientMetadata(
 }  // namespace
 
 auto Server::MatchAndPublishCall(CallHandler call_handler) {
-  call_handler.SpawnGuarded("request_matcher", [this, call_handler]() mutable {
-    return TrySeq(
-        // Wait for initial metadata to pass through all filters
-        Map(call_handler.PullClientInitialMetadata(), CheckClientMetadata),
-        // Match request with requested call
-        [this, call_handler](ClientMetadataHandle md) mutable {
-          auto* registered_method = static_cast<RegisteredMethod*>(
-              md->get(GrpcRegisteredMethod()).value_or(nullptr));
-          RequestMatcherInterface* rm;
-          grpc_server_register_method_payload_handling payload_handling =
-              GRPC_SRM_PAYLOAD_NONE;
-          if (registered_method == nullptr) {
-            rm = unregistered_request_matcher_.get();
-          } else {
-            payload_handling = registered_method->payload_handling;
-            rm = registered_method->matcher.get();
-          }
-          auto maybe_read_first_message = If(
-              payload_handling == GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER,
-              [call_handler]() mutable { return call_handler.PullMessage(); },
-              []() -> ValueOrFailure<absl::optional<MessageHandle>> {
-                return ValueOrFailure<absl::optional<MessageHandle>>(
-                    absl::nullopt);
-              });
-          return TryJoin<absl::StatusOr>(
-              std::move(maybe_read_first_message), rm->MatchRequest(0),
-              [md = std::move(md)]() mutable {
-                return ValueOrFailure<ClientMetadataHandle>(std::move(md));
-              });
-        },
-        // Publish call to cq
-        [call_handler, this](std::tuple<absl::optional<MessageHandle>,
-                                        RequestMatcherInterface::MatchResult,
-                                        ClientMetadataHandle>
-                                 r) {
-          RequestMatcherInterface::MatchResult& mr = std::get<1>(r);
-          auto md = std::move(std::get<2>(r));
-          auto* rc = mr.TakeCall();
-          rc->Complete(std::move(std::get<0>(r)), *md);
-          grpc_call* call =
-              MakeServerCall(call_handler, std::move(md), this,
-                             rc->cq_bound_to_call, rc->initial_metadata);
-          *rc->call = call;
-          return Map(WaitForCqEndOp(false, rc->tag, absl::OkStatus(), mr.cq()),
-                     [rc = std::unique_ptr<RequestedCall>(rc)](Empty) {
-                       return absl::OkStatus();
-                     });
-        });
-  });
+  call_handler.SpawnGuardedUntilCallCompletes(
+      "request_matcher", [this, call_handler]() mutable {
+        return TrySeq(
+            // Wait for initial metadata to pass through all filters
+            Map(call_handler.PullClientInitialMetadata(), CheckClientMetadata),
+            // Match request with requested call
+            [this, call_handler](ClientMetadataHandle md) mutable {
+              auto* registered_method = static_cast<RegisteredMethod*>(
+                  md->get(GrpcRegisteredMethod()).value_or(nullptr));
+              RequestMatcherInterface* rm;
+              grpc_server_register_method_payload_handling payload_handling =
+                  GRPC_SRM_PAYLOAD_NONE;
+              if (registered_method == nullptr) {
+                rm = unregistered_request_matcher_.get();
+              } else {
+                payload_handling = registered_method->payload_handling;
+                rm = registered_method->matcher.get();
+              }
+              auto maybe_read_first_message = If(
+                  payload_handling == GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER,
+                  [call_handler]() mutable {
+                    return call_handler.PullMessage();
+                  },
+                  []() -> ValueOrFailure<absl::optional<MessageHandle>> {
+                    return ValueOrFailure<absl::optional<MessageHandle>>(
+                        absl::nullopt);
+                  });
+              return TryJoin<absl::StatusOr>(
+                  std::move(maybe_read_first_message), rm->MatchRequest(0),
+                  [md = std::move(md)]() mutable {
+                    return ValueOrFailure<ClientMetadataHandle>(std::move(md));
+                  });
+            },
+            // Publish call to cq
+            [call_handler,
+             this](std::tuple<absl::optional<MessageHandle>,
+                              RequestMatcherInterface::MatchResult,
+                              ClientMetadataHandle>
+                       r) {
+              RequestMatcherInterface::MatchResult& mr = std::get<1>(r);
+              auto md = std::move(std::get<2>(r));
+              auto* rc = mr.TakeCall();
+              rc->Complete(std::move(std::get<0>(r)), *md);
+              grpc_call* call =
+                  MakeServerCall(call_handler, std::move(md), this,
+                                 rc->cq_bound_to_call, rc->initial_metadata);
+              *rc->call = call;
+              return Map(
+                  WaitForCqEndOp(false, rc->tag, absl::OkStatus(), mr.cq()),
+                  [rc = std::unique_ptr<RequestedCall>(rc)](Empty) {
+                    return absl::OkStatus();
+                  });
+            });
+      });
 }
 
 absl::StatusOr<RefCountedPtr<UnstartedCallDestination>>

From e35831a5a85bb2e00e37dc0671e5dbe3be5087f6 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Wed, 9 Oct 2024 15:59:16 -0700
Subject: [PATCH 47/74] [logging_test] Fix timeout (#37874)

Closes #37874

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37874 from yashykt:FixLoggingTest fa5d67230cafa480eadc0d7a6e71d7dbb62ebd63
PiperOrigin-RevId: 684201591
---
 test/cpp/ext/filters/logging/library.h       | 10 ++++++++--
 test/cpp/ext/filters/logging/logging_test.cc | 10 +++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/test/cpp/ext/filters/logging/library.h b/test/cpp/ext/filters/logging/library.h
index bffa8a18fe7..fcb918660c1 100644
--- a/test/cpp/ext/filters/logging/library.h
+++ b/test/cpp/ext/filters/logging/library.h
@@ -83,12 +83,18 @@ class TestLoggingSink : public grpc_core::LoggingSink {
   }
 
   // Waits for \a duration till we have \a num_entries in the log.
-  void WaitForNumEntries(size_t num_entries, absl::Duration duration) {
+  bool WaitForNumEntries(size_t num_entries, absl::Duration duration) {
     absl::Time deadline = absl::Now() + duration * grpc_test_slowdown_factor();
     grpc_core::MutexLock lock(&mu_);
     while (entries_.size() != num_entries) {
-      cv_.WaitWithDeadline(&mu_, deadline);
+      if (cv_.WaitWithDeadline(&mu_, deadline)) {
+        LOG(ERROR) << "\nDeadline expired while waiting on logging "
+                      "entries\nExpected number: "
+                   << num_entries << "\nActual number: " << entries_.size();
+        return false;
+      }
     }
+    return true;
   }
 
  private:
diff --git a/test/cpp/ext/filters/logging/logging_test.cc b/test/cpp/ext/filters/logging/logging_test.cc
index e94c5c5889e..e1ffd6941ac 100644
--- a/test/cpp/ext/filters/logging/logging_test.cc
+++ b/test/cpp/ext/filters/logging/logging_test.cc
@@ -62,7 +62,7 @@ TEST_F(LoggingTest, SimpleRpc) {
   context.AddMetadata("key", "value");
   grpc::Status status = stub_->Echo(&context, request, &response);
   EXPECT_TRUE(status.ok());
-  g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5));
+  ASSERT_TRUE(g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5)));
   EXPECT_THAT(
       g_test_logging_sink->entries(),
       ::testing::UnorderedElementsAre(
@@ -246,7 +246,7 @@ TEST_F(LoggingTest, SimpleRpcNoMetadata) {
   grpc::ClientContext context;
   grpc::Status status = stub_->Echo(&context, request, &response);
   EXPECT_TRUE(status.ok());
-  g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5));
+  ASSERT_TRUE(g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5)));
   EXPECT_THAT(
       g_test_logging_sink->entries(),
       ::testing::UnorderedElementsAre(
@@ -447,7 +447,7 @@ TEST_F(LoggingTest, MetadataTruncated) {
   context.AddMetadata("key-2", "value-2");
   grpc::Status status = stub_->Echo(&context, request, &response);
   EXPECT_TRUE(status.ok());
-  g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5));
+  ASSERT_TRUE(g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5)));
   EXPECT_THAT(
       g_test_logging_sink->entries(),
       ::testing::UnorderedElementsAre(
@@ -630,7 +630,7 @@ TEST_F(LoggingTest, PayloadTruncated) {
   grpc::ClientContext context;
   grpc::Status status = stub_->Echo(&context, request, &response);
   EXPECT_TRUE(status.ok());
-  g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5));
+  ASSERT_TRUE(g_test_logging_sink->WaitForNumEntries(12, absl::Seconds(5)));
   EXPECT_THAT(
       g_test_logging_sink->entries(),
       ::testing::UnorderedElementsAre(
@@ -861,7 +861,7 @@ TEST_F(LoggingTest, ServerCancelsRpc) {
   EXPECT_EQ(status.error_code(), 25);
   EXPECT_EQ(status.error_message(), "error message");
   EXPECT_EQ(status.error_details(), "binary error details");
-  g_test_logging_sink->WaitForNumEntries(9, absl::Seconds(5));
+  ASSERT_TRUE(g_test_logging_sink->WaitForNumEntries(9, absl::Seconds(5)));
   EXPECT_THAT(
       g_test_logging_sink->entries(),
       ::testing::UnorderedElementsAre(

From 4cf2759096c9567853098dc967dfd35e377c5c49 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Wed, 9 Oct 2024 16:00:03 -0700
Subject: [PATCH 48/74] [XdsE2ETest] Enable tracers (#37875)

I'm unable to reproduce some of the flakiness here. Enabling tracers to get more information.

Closes #37875

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37875 from yashykt:MoreLogsInXdsE2ETest 4a7eb67202dad0b9f79739bd9b09117c56ec905d
PiperOrigin-RevId: 684201791
---
 test/cpp/end2end/xds/xds_end2end_test.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/cpp/end2end/xds/xds_end2end_test.cc b/test/cpp/end2end/xds/xds_end2end_test.cc
index 428a88c5edc..05fad509a0f 100644
--- a/test/cpp/end2end/xds/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_end2end_test.cc
@@ -3507,6 +3507,9 @@ int main(int argc, char** argv) {
   // updates from all the subchannels's FDs.
   grpc_core::ConfigVars::Overrides overrides;
   overrides.client_channel_backup_poll_interval_ms = 1;
+  overrides.trace =
+      "call,channel,client_channel,client_channel_call,client_channel_lb_call,"
+      "handshaker";
   grpc_core::ConfigVars::SetOverrides(overrides);
 #if TARGET_OS_IPHONE
   // Workaround Apple CFStream bug

From 7a413d14f9aa38c6a630d5c952b2dafcd75e3134 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 10 Oct 2024 11:59:49 -0700
Subject: [PATCH 49/74] [e2e] Mark a few tests flaky (#37880)

I'm continuing to look into some flakes here, but in the meantime these shouldn't halt submissions. Marking them flaky.

Closes #37880

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37880 from ctiller:mark-flaky 27427c79784be10933666fcb4765fd163b260d49
PiperOrigin-RevId: 684526341
---
 build_autogenerated.yaml                     |  2 +
 test/core/end2end/BUILD                      |  6 ++-
 test/core/end2end/grpc_core_end2end_test.bzl |  4 +-
 tools/run_tests/generated/tests.json         | 48 --------------------
 4 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 3ae9dd5577c..785776254f8 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -7481,6 +7481,7 @@ targets:
 - name: cancel_after_invoke_test
   gtest: true
   build: test
+  run: false
   language: c++
   headers:
   - src/core/ext/transport/chaotic_good/chaotic_good_transport.h
@@ -7858,6 +7859,7 @@ targets:
 - name: cancel_with_status_test
   gtest: true
   build: test
+  run: false
   language: c++
   headers:
   - src/core/ext/transport/chaotic_good/chaotic_good_transport.h
diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD
index 51032c0b1e2..debaf2ef38c 100644
--- a/test/core/end2end/BUILD
+++ b/test/core/end2end/BUILD
@@ -312,6 +312,7 @@ grpc_core_end2end_test(
 
 grpc_core_end2end_test(
     name = "cancel_after_invoke",
+    flaky = True,
     shard_count = 50,
 )
 
@@ -324,7 +325,10 @@ grpc_core_end2end_test(name = "cancel_before_invoke")
 
 grpc_core_end2end_test(name = "cancel_in_a_vacuum")
 
-grpc_core_end2end_test(name = "cancel_with_status")
+grpc_core_end2end_test(
+    name = "cancel_with_status",
+    flaky = True,
+)
 
 grpc_core_end2end_test(name = "channelz")
 
diff --git a/test/core/end2end/grpc_core_end2end_test.bzl b/test/core/end2end/grpc_core_end2end_test.bzl
index 9c7c5611ba3..7a61f289fd2 100644
--- a/test/core/end2end/grpc_core_end2end_test.bzl
+++ b/test/core/end2end/grpc_core_end2end_test.bzl
@@ -25,13 +25,14 @@ END2END_TEST_DATA = [
     "//src/core/tsi/test_creds:server1.pem",
 ]
 
-def grpc_core_end2end_test(name, shard_count = 10, tags = []):
+def grpc_core_end2end_test(name, shard_count = 10, tags = [], flaky = False):
     """Generate one core end2end test
 
     Args:
         name: name of the test, must correspond to a "test/name.cc" file
         shard_count: per bazel
         tags: per bazel
+        flaky: per bazel
     """
 
     if len(name) > 60:
@@ -112,6 +113,7 @@ def grpc_core_end2end_test(name, shard_count = 10, tags = []):
             "%s_library" % name,
         ],
         tags = ["core_end2end_test", "thready_tsan"] + tags,
+        flaky = flaky,
     )
 
     grpc_proto_fuzzer(
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 991313c58b5..815a4fc2b0e 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -1515,30 +1515,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "cancel_after_invoke_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
   {
     "args": [],
     "benchmark": false,
@@ -1659,30 +1635,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "cancel_with_status_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
   {
     "args": [],
     "benchmark": false,

From e52e48b7ef83feeff56ed0894ce39841ea8bd483 Mon Sep 17 00:00:00 2001
From: Xuan Wang <xuanwn@google.com>
Date: Thu, 10 Oct 2024 12:33:07 -0700
Subject: [PATCH 50/74] [Python Bazel] Revert Cython upgrade (#37884)

We're seeing some Bazel tests timing out due to this upgrade, revert this for now until we resolved the issue.
<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37884

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37884 from XuanWang-Amos:revert_cython_upgrade 0071889b5cf30ce4d65d7ac1b0c1b1139f81e74c
PiperOrigin-RevId: 684538459
---
 bazel/grpc_python_deps.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bazel/grpc_python_deps.bzl b/bazel/grpc_python_deps.bzl
index 44eca11f671..dbfff526a11 100644
--- a/bazel/grpc_python_deps.bzl
+++ b/bazel/grpc_python_deps.bzl
@@ -38,9 +38,9 @@ def grpc_python_deps():
         http_archive(
             name = "cython",
             build_file = "@com_github_grpc_grpc//third_party:cython.BUILD",
-            sha256 = "2ec7d66d23d6da2328fb24f5c1bec6c63a59ec2e91027766ab904f417e1078aa",
-            strip_prefix = "cython-3.0.11",
+            sha256 = "a2da56cc22be823acf49741b9aa3aa116d4f07fa8e8b35a3cb08b8447b37c607",
+            strip_prefix = "cython-0.29.35",
             urls = [
-                "https://github.com/cython/cython/archive/3.0.11.tar.gz",
+                "https://github.com/cython/cython/archive/0.29.35.tar.gz",
             ],
         )

From f9a4ee1019afdb4a44dae50256f24bd470e55037 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 10 Oct 2024 14:25:12 -0700
Subject: [PATCH 51/74] Revert "[chaotic-good] Fix some ref leaks (#37865)"
 (#37882)

This reverts commit e8aa408bba78552d995ec8d953690b42712c808b.

It looks like this increased flakiness... I'm going to roll forward the separate pieces after this.

Closes #37882

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37882 from ctiller:flake-fightas-17 6e666cd9856381c77f586cb833bbbbd52bb7834f
PiperOrigin-RevId: 684577945
---
 .../chaotic_good/server_transport.cc          |  88 +++++++--------
 .../transport/chaotic_good/server_transport.h |   4 +-
 src/core/server/server.cc                     | 103 +++++++++---------
 3 files changed, 95 insertions(+), 100 deletions(-)

diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index 42c2ddb501e..b166d79380f 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -125,13 +125,14 @@ auto ChaoticGoodServerTransport::MaybePushFragmentIntoCall(
 }
 
 auto ChaoticGoodServerTransport::SendFragment(
-    ServerFragmentFrame frame, MpscSender<ServerFrame> outgoing_frames) {
+    ServerFragmentFrame frame, MpscSender<ServerFrame> outgoing_frames,
+    CallInitiator call_initiator) {
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD: SendFragment: frame=" << frame.ToString();
   // Capture the call_initiator to ensure the underlying call spine is alive
   // until the outgoing_frames.Send promise completes.
   return Map(outgoing_frames.Send(std::move(frame)),
-             [](bool success) -> absl::Status {
+             [call_initiator](bool success) -> absl::Status {
                if (!success) {
                  // Failed to send outgoing frame.
                  return absl::UnavailableError("Transport closed.");
@@ -145,26 +146,27 @@ auto ChaoticGoodServerTransport::SendCallBody(
     CallInitiator call_initiator) {
   // Continuously send client frame with client to server
   // messages.
-  return ForEach(OutgoingMessages(call_initiator),
-                 // Capture the call_initator to ensure the underlying call
-                 // spine is alive until the SendFragment promise completes.
-                 [stream_id, outgoing_frames, aligned_bytes = aligned_bytes_](
-                     MessageHandle message) mutable {
-                   ServerFragmentFrame frame;
-                   // Construct frame header (flags, header_length
-                   // and trailer_length will be added in
-                   // serialization).
-                   const uint32_t message_length = message->payload()->Length();
-                   const uint32_t padding =
-                       message_length % aligned_bytes == 0
-                           ? 0
-                           : aligned_bytes - (message_length % aligned_bytes);
-                   CHECK_EQ((message_length + padding) % aligned_bytes, 0u);
-                   frame.message = FragmentMessage(std::move(message), padding,
-                                                   message_length);
-                   frame.stream_id = stream_id;
-                   return SendFragment(std::move(frame), outgoing_frames);
-                 });
+  return ForEach(
+      OutgoingMessages(call_initiator),
+      // Capture the call_initator to ensure the underlying call
+      // spine is alive until the SendFragment promise completes.
+      [stream_id, outgoing_frames, call_initiator,
+       aligned_bytes = aligned_bytes_](MessageHandle message) mutable {
+        ServerFragmentFrame frame;
+        // Construct frame header (flags, header_length
+        // and trailer_length will be added in
+        // serialization).
+        const uint32_t message_length = message->payload()->Length();
+        const uint32_t padding =
+            message_length % aligned_bytes == 0
+                ? 0
+                : aligned_bytes - message_length % aligned_bytes;
+        CHECK_EQ((message_length + padding) % aligned_bytes, 0u);
+        frame.message =
+            FragmentMessage(std::move(message), padding, message_length);
+        frame.stream_id = stream_id;
+        return SendFragment(std::move(frame), outgoing_frames, call_initiator);
+      });
 }
 
 auto ChaoticGoodServerTransport::SendCallInitialMetadataAndBody(
@@ -185,7 +187,8 @@ auto ChaoticGoodServerTransport::SendCallInitialMetadataAndBody(
               frame.headers = std::move(*md);
               frame.stream_id = stream_id;
               return TrySeq(
-                  SendFragment(std::move(frame), outgoing_frames),
+                  SendFragment(std::move(frame), outgoing_frames,
+                               call_initiator),
                   SendCallBody(stream_id, outgoing_frames, call_initiator));
             },
             []() { return absl::OkStatus(); });
@@ -206,11 +209,15 @@ auto ChaoticGoodServerTransport::CallOutboundLoop(
                 return Empty{};
               }),
           call_initiator.PullServerTrailingMetadata(),
-          [stream_id, outgoing_frames](ServerMetadataHandle md) mutable {
+          // Capture the call_initator to ensure the underlying call_spine
+          // is alive until the SendFragment promise completes.
+          [stream_id, outgoing_frames,
+           call_initiator](ServerMetadataHandle md) mutable {
             ServerFragmentFrame frame;
             frame.trailers = std::move(md);
             frame.stream_id = stream_id;
-            return SendFragment(std::move(frame), outgoing_frames);
+            return SendFragment(std::move(frame), outgoing_frames,
+                                call_initiator);
           }));
 }
 
@@ -302,11 +309,10 @@ auto ChaoticGoodServerTransport::ReadOneFrame(ChaoticGoodTransport& transport) {
                            call_initiator.has_value(),
                            [&call_initiator]() {
                              auto c = std::move(*call_initiator);
-                             return c.SpawnWaitable("cancel_from_read",
-                                                    [c]() mutable {
-                                                      c.Cancel();
-                                                      return absl::OkStatus();
-                                                    });
+                             return c.SpawnWaitable("cancel", [c]() mutable {
+                               c.Cancel();
+                               return absl::OkStatus();
+                             });
                            },
                            []() -> absl::Status { return absl::OkStatus(); });
                      }),
@@ -391,8 +397,6 @@ void ChaoticGoodServerTransport::AbortWithError() {
   // Close all the available pipes.
   outgoing_frames_.MarkClosed();
   ReleasableMutexLock lock(&mu_);
-  if (aborted_with_error_) return;
-  aborted_with_error_ = true;
   StreamMap stream_map = std::move(stream_map_);
   stream_map_.clear();
   state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN,
@@ -401,19 +405,18 @@ void ChaoticGoodServerTransport::AbortWithError() {
   lock.Release();
   for (const auto& pair : stream_map) {
     auto call_initiator = pair.second;
-    call_initiator.SpawnInfallible("cancel_from_transport_closed",
-                                   [call_initiator]() mutable {
-                                     call_initiator.Cancel();
-                                     return Empty{};
-                                   });
+    call_initiator.SpawnInfallible("cancel", [call_initiator]() mutable {
+      call_initiator.Cancel();
+      return Empty{};
+    });
   }
 }
 
 absl::optional<CallInitiator> ChaoticGoodServerTransport::LookupStream(
     uint32_t stream_id) {
-  MutexLock lock(&mu_);
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD " << this << " LookupStream " << stream_id;
+  MutexLock lock(&mu_);
   auto it = stream_map_.find(stream_id);
   if (it == stream_map_.end()) return absl::nullopt;
   return it->second;
@@ -421,9 +424,9 @@ absl::optional<CallInitiator> ChaoticGoodServerTransport::LookupStream(
 
 absl::optional<CallInitiator> ChaoticGoodServerTransport::ExtractStream(
     uint32_t stream_id) {
-  MutexLock lock(&mu_);
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD " << this << " ExtractStream " << stream_id;
+  MutexLock lock(&mu_);
   auto it = stream_map_.find(stream_id);
   if (it == stream_map_.end()) return absl::nullopt;
   auto r = std::move(it->second);
@@ -433,12 +436,9 @@ absl::optional<CallInitiator> ChaoticGoodServerTransport::ExtractStream(
 
 absl::Status ChaoticGoodServerTransport::NewStream(
     uint32_t stream_id, CallInitiator call_initiator) {
-  MutexLock lock(&mu_);
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD " << this << " NewStream " << stream_id;
-  if (aborted_with_error_) {
-    return absl::UnavailableError("Transport closed");
-  }
+  MutexLock lock(&mu_);
   auto it = stream_map_.find(stream_id);
   if (it != stream_map_.end()) {
     return absl::InternalError("Stream already exists");
@@ -454,7 +454,7 @@ absl::Status ChaoticGoodServerTransport::NewStream(
             self->ExtractStream(stream_id);
         if (call_initiator.has_value()) {
           auto c = std::move(*call_initiator);
-          c.SpawnInfallible("cancel_from_on_done", [c]() mutable {
+          c.SpawnInfallible("cancel", [c]() mutable {
             c.Cancel();
             return Empty{};
           });
diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h
index 65929533f68..49fd5ae015f 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.h
+++ b/src/core/ext/transport/chaotic_good/server_transport.h
@@ -109,7 +109,8 @@ class ChaoticGoodServerTransport final : public ServerTransport {
   auto SendCallBody(uint32_t stream_id, MpscSender<ServerFrame> outgoing_frames,
                     CallInitiator call_initiator);
   static auto SendFragment(ServerFragmentFrame frame,
-                           MpscSender<ServerFrame> outgoing_frames);
+                           MpscSender<ServerFrame> outgoing_frames,
+                           CallInitiator call_initiator);
   auto CallOutboundLoop(uint32_t stream_id, CallInitiator call_initiator);
   auto OnTransportActivityDone(absl::string_view activity);
   auto TransportReadLoop(RefCountedPtr<ChaoticGoodTransport> transport);
@@ -143,7 +144,6 @@ class ChaoticGoodServerTransport final : public ServerTransport {
   // Map of stream incoming server frames, key is stream_id.
   StreamMap stream_map_ ABSL_GUARDED_BY(mu_);
   uint32_t last_seen_new_stream_id_ = 0;
-  bool aborted_with_error_ ABSL_GUARDED_BY(mu_) = false;
   RefCountedPtr<Party> party_;
   ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(mu_){
       "chaotic_good_server", GRPC_CHANNEL_READY};
diff --git a/src/core/server/server.cc b/src/core/server/server.cc
index 87bb72a0dee..5ec784a5c96 100644
--- a/src/core/server/server.cc
+++ b/src/core/server/server.cc
@@ -813,60 +813,55 @@ absl::StatusOr<ClientMetadataHandle> CheckClientMetadata(
 }  // namespace
 
 auto Server::MatchAndPublishCall(CallHandler call_handler) {
-  call_handler.SpawnGuardedUntilCallCompletes(
-      "request_matcher", [this, call_handler]() mutable {
-        return TrySeq(
-            // Wait for initial metadata to pass through all filters
-            Map(call_handler.PullClientInitialMetadata(), CheckClientMetadata),
-            // Match request with requested call
-            [this, call_handler](ClientMetadataHandle md) mutable {
-              auto* registered_method = static_cast<RegisteredMethod*>(
-                  md->get(GrpcRegisteredMethod()).value_or(nullptr));
-              RequestMatcherInterface* rm;
-              grpc_server_register_method_payload_handling payload_handling =
-                  GRPC_SRM_PAYLOAD_NONE;
-              if (registered_method == nullptr) {
-                rm = unregistered_request_matcher_.get();
-              } else {
-                payload_handling = registered_method->payload_handling;
-                rm = registered_method->matcher.get();
-              }
-              auto maybe_read_first_message = If(
-                  payload_handling == GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER,
-                  [call_handler]() mutable {
-                    return call_handler.PullMessage();
-                  },
-                  []() -> ValueOrFailure<absl::optional<MessageHandle>> {
-                    return ValueOrFailure<absl::optional<MessageHandle>>(
-                        absl::nullopt);
-                  });
-              return TryJoin<absl::StatusOr>(
-                  std::move(maybe_read_first_message), rm->MatchRequest(0),
-                  [md = std::move(md)]() mutable {
-                    return ValueOrFailure<ClientMetadataHandle>(std::move(md));
-                  });
-            },
-            // Publish call to cq
-            [call_handler,
-             this](std::tuple<absl::optional<MessageHandle>,
-                              RequestMatcherInterface::MatchResult,
-                              ClientMetadataHandle>
-                       r) {
-              RequestMatcherInterface::MatchResult& mr = std::get<1>(r);
-              auto md = std::move(std::get<2>(r));
-              auto* rc = mr.TakeCall();
-              rc->Complete(std::move(std::get<0>(r)), *md);
-              grpc_call* call =
-                  MakeServerCall(call_handler, std::move(md), this,
-                                 rc->cq_bound_to_call, rc->initial_metadata);
-              *rc->call = call;
-              return Map(
-                  WaitForCqEndOp(false, rc->tag, absl::OkStatus(), mr.cq()),
-                  [rc = std::unique_ptr<RequestedCall>(rc)](Empty) {
-                    return absl::OkStatus();
-                  });
-            });
-      });
+  call_handler.SpawnGuarded("request_matcher", [this, call_handler]() mutable {
+    return TrySeq(
+        // Wait for initial metadata to pass through all filters
+        Map(call_handler.PullClientInitialMetadata(), CheckClientMetadata),
+        // Match request with requested call
+        [this, call_handler](ClientMetadataHandle md) mutable {
+          auto* registered_method = static_cast<RegisteredMethod*>(
+              md->get(GrpcRegisteredMethod()).value_or(nullptr));
+          RequestMatcherInterface* rm;
+          grpc_server_register_method_payload_handling payload_handling =
+              GRPC_SRM_PAYLOAD_NONE;
+          if (registered_method == nullptr) {
+            rm = unregistered_request_matcher_.get();
+          } else {
+            payload_handling = registered_method->payload_handling;
+            rm = registered_method->matcher.get();
+          }
+          auto maybe_read_first_message = If(
+              payload_handling == GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER,
+              [call_handler]() mutable { return call_handler.PullMessage(); },
+              []() -> ValueOrFailure<absl::optional<MessageHandle>> {
+                return ValueOrFailure<absl::optional<MessageHandle>>(
+                    absl::nullopt);
+              });
+          return TryJoin<absl::StatusOr>(
+              std::move(maybe_read_first_message), rm->MatchRequest(0),
+              [md = std::move(md)]() mutable {
+                return ValueOrFailure<ClientMetadataHandle>(std::move(md));
+              });
+        },
+        // Publish call to cq
+        [call_handler, this](std::tuple<absl::optional<MessageHandle>,
+                                        RequestMatcherInterface::MatchResult,
+                                        ClientMetadataHandle>
+                                 r) {
+          RequestMatcherInterface::MatchResult& mr = std::get<1>(r);
+          auto md = std::move(std::get<2>(r));
+          auto* rc = mr.TakeCall();
+          rc->Complete(std::move(std::get<0>(r)), *md);
+          grpc_call* call =
+              MakeServerCall(call_handler, std::move(md), this,
+                             rc->cq_bound_to_call, rc->initial_metadata);
+          *rc->call = call;
+          return Map(WaitForCqEndOp(false, rc->tag, absl::OkStatus(), mr.cq()),
+                     [rc = std::unique_ptr<RequestedCall>(rc)](Empty) {
+                       return absl::OkStatus();
+                     });
+        });
+  });
 }
 
 absl::StatusOr<RefCountedPtr<UnstartedCallDestination>>

From 834e5f35828ed16eac6744694ac8ba4f002f0b0c Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Thu, 10 Oct 2024 14:42:31 -0700
Subject: [PATCH 52/74] [EventEngine] Enable the PosixEventEngine client
 experiment (#35985)

Closes #35985

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35985 from drfloob:posix-ee-client-flip 15bab7a3b32c58fd51180f19c4d956dad04fc47d
PiperOrigin-RevId: 684583835
---
 bazel/experiments.bzl                   | 8 ++++----
 src/core/lib/experiments/experiments.cc | 2 +-
 src/core/lib/experiments/experiments.h  | 3 ++-
 src/core/lib/experiments/rollouts.yaml  | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 5ea1cd99f37..f9035a02199 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -135,16 +135,12 @@ EXPERIMENTS = {
         },
         "off": {
             "core_end2end_test": [
-                "event_engine_client",
                 "local_connector_secure",
             ],
             "endpoint_test": [
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
             ],
-            "event_engine_client_test": [
-                "event_engine_client",
-            ],
             "flow_control_test": [
                 "multiping",
                 "tcp_frame_size_tuning",
@@ -160,6 +156,7 @@ EXPERIMENTS = {
                 "event_engine_dns",
             ],
             "core_end2end_test": [
+                "event_engine_client",
                 "event_engine_listener",
                 "work_serializer_dispatch",
             ],
@@ -169,6 +166,9 @@ EXPERIMENTS = {
             "cpp_lb_end2end_test": [
                 "pick_first_new",
             ],
+            "event_engine_client_test": [
+                "event_engine_client",
+            ],
             "event_engine_listener_test": [
                 "event_engine_listener",
             ],
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index 8c9675e0dd2..664498e252d 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -397,7 +397,7 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_event_engine_application_callbacks, nullptr, 0,
      true, true},
     {"event_engine_client", description_event_engine_client,
-     additional_constraints_event_engine_client, nullptr, 0, false, true},
+     additional_constraints_event_engine_client, nullptr, 0, true, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, true, false},
     {"event_engine_listener", description_event_engine_listener,
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index afc86b9ce51..f39ff23df80 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -126,7 +126,8 @@ inline bool IsCanaryClientPrivacyEnabled() { return false; }
 inline bool IsClientPrivacyEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_APPLICATION_CALLBACKS
 inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
-inline bool IsEventEngineClientEnabled() { return false; }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_CLIENT
+inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
 inline bool IsEventEngineDnsEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml
index eb86f1d851e..58840fa1adb 100644
--- a/src/core/lib/experiments/rollouts.yaml
+++ b/src/core/lib/experiments/rollouts.yaml
@@ -59,7 +59,7 @@
   default:
     # not tested on iOS at all
     ios: broken
-    posix: false
+    posix: true
     windows: true
 - name: event_engine_dns
   default:

From bac52d8d52594d759af8ca52261cd85ad529b40e Mon Sep 17 00:00:00 2001
From: Kannan J <kannanjgithub@google.com>
Date: Thu, 10 Oct 2024 14:57:28 -0700
Subject: [PATCH 53/74] Change the arg name used by XDS client example to
 indicate secure mode. (#37776)

Change flag used by the xds client example from --secure to --xds-creds. This woul
d be consistent with the [user guide](https://cloud.google.com/service-mesh/docs/service-routing/security-proxyless-setup#c++_2) where it says to use --xds-creds. It would also make it consistnt with other language examples -x the [Python example xds client](https://github.com/grpc/grpc/blob/master/examples/python/xds/client.py#L47) and the [Java example xds client](https://github.com/grpc/grpc-java/blob/master/examples/example-xds/src/main/java/io/grpc/examples/helloworldxds/XdsHelloWorldClient.java#L74) .

Closes #37776

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37776 from kannanjgithub:fix_xds_arg 0f7b6653662daba1771a156caca9f251367456da
PiperOrigin-RevId: 684588418
---
 examples/cpp/xds/README.md             | 2 +-
 examples/cpp/xds/xds_greeter_client.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/cpp/xds/README.md b/examples/cpp/xds/README.md
index 6d28838cab1..a0b0f266151 100644
--- a/examples/cpp/xds/README.md
+++ b/examples/cpp/xds/README.md
@@ -6,7 +6,7 @@ This xDS example builds on the [Hello World Example](https://github.com/grpc/grp
 
 The client takes two command-line arguments -
 * target - By default, the client tries to connect to the xDS "xds:///helloworld:50051" and gRPC would use xDS to resolve this target and connect to the server backend. This can be overridden to change the target.
-* secure - Bool value, defaults to true. When this is set, [XdsCredentials](https://github.com/grpc/proposal/blob/master/A29-xds-tls-security.md) will be used with a fallback on `InsecureChannelCredentials`. If unset, `InsecureChannelCredentials` will be used.
+* xds-creds - Bool value, defaults to true. When this is set, [XdsCredentials](https://github.com/grpc/proposal/blob/master/A29-xds-tls-security.md) will be used with a fallback on `InsecureChannelCredentials`. If unset, `InsecureChannelCredentials` will be used.
 
 The server takes three command-line arguments -
 * port - Port on which the Hello World service is run. Defaults to 50051.
diff --git a/examples/cpp/xds/xds_greeter_client.cc b/examples/cpp/xds/xds_greeter_client.cc
index d60e3f17d81..5a6728873b8 100644
--- a/examples/cpp/xds/xds_greeter_client.cc
+++ b/examples/cpp/xds/xds_greeter_client.cc
@@ -34,7 +34,7 @@
 #endif
 
 ABSL_FLAG(std::string, target, "xds:///helloworld:50051", "Target string");
-ABSL_FLAG(bool, secure, true, "Secure mode");
+ABSL_FLAG(bool, xds_creds, true, "Secure mode");
 
 using grpc::Channel;
 using grpc::ClientContext;
@@ -98,7 +98,7 @@ int main(int argc, char** argv) {
   absl::ParseCommandLine(argc, argv);
   GreeterClient greeter(grpc::CreateChannel(
       absl::GetFlag(FLAGS_target),
-      absl::GetFlag(FLAGS_secure)
+      absl::GetFlag(FLAGS_xds_creds)
           ? grpc::XdsCredentials(grpc::InsecureChannelCredentials())
           : grpc::InsecureChannelCredentials()));
   std::string user("world");

From b2a05bebe0ddbd8cc6b26af143b2a9f7d8d9933a Mon Sep 17 00:00:00 2001
From: Nathan Baulch <nathan.baulch@gmail.com>
Date: Thu, 10 Oct 2024 15:35:34 -0700
Subject: [PATCH 54/74] [maintenance] Fix cpp typos (#37755)

Continuation of #37541 but focused on C++.

Closes #37755

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37755 from NathanBaulch:typos-cpp 9a7fd9d65fa97a689d529772534df1a501031e9f
PiperOrigin-RevId: 684600898
---
 examples/cpp/unix_abstract_sockets/README.md         |  2 +-
 src/cpp/README.md                                    |  2 +-
 src/cpp/ext/filters/census/server_call_tracer.cc     |  2 +-
 src/cpp/ext/gcp/observability_config.cc              |  2 +-
 src/cpp/server/server_cc.cc                          |  2 +-
 src/cpp/thread_manager/thread_manager.h              |  6 +++---
 .../cpp/naming/resolver_component_tests_defs.include |  2 +-
 test/cpp/README-iOS.md                               |  2 +-
 test/cpp/cocoapods/Podfile                           |  2 +-
 test/cpp/end2end/async_end2end_test.cc               |  4 ++--
 test/cpp/end2end/cfstream_test.cc                    |  2 +-
 test/cpp/end2end/channelz_service_test.cc            |  2 +-
 test/cpp/end2end/client_callback_end2end_test.cc     |  2 +-
 test/cpp/end2end/client_lb_end2end_test.cc           |  2 +-
 test/cpp/end2end/end2end_test.cc                     |  2 +-
 test/cpp/end2end/proto_server_reflection_test.cc     |  2 +-
 .../xds/xds_outlier_detection_end2end_test.cc        |  4 ++--
 test/cpp/end2end/xds/xds_server.h                    | 12 ++++++------
 test/cpp/interop/interop_client.h                    |  2 +-
 test/cpp/interop/istio_echo_server.cc                |  4 ++--
 test/cpp/interop/metrics_client.cc                   |  2 +-
 test/cpp/microbenchmarks/bm_event_engine_run.cc      |  2 +-
 .../microbenchmarks/fullstack_streaming_ping_pong.h  |  6 +++---
 test/cpp/naming/resolver_component_tests_runner.py   |  2 +-
 .../resolver_component_tests_runner_invoker.cc       |  2 +-
 test/cpp/naming/utils/dns_server.py                  |  2 +-
 test/cpp/naming/utils/health_check.py                |  2 +-
 test/cpp/qps/qps_json_driver.cc                      |  5 +++--
 .../cpp/server/load_reporter/load_data_store_test.cc |  8 ++++----
 test/cpp/util/cli_call.h                             |  4 ++--
 test/distrib/cpp/run_distrib_test_cmake.bat          |  2 +-
 test/distrib/cpp/run_distrib_test_cmake_for_dll.bat  |  2 +-
 32 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/examples/cpp/unix_abstract_sockets/README.md b/examples/cpp/unix_abstract_sockets/README.md
index 482a4a64273..c4eb59bdd14 100644
--- a/examples/cpp/unix_abstract_sockets/README.md
+++ b/examples/cpp/unix_abstract_sockets/README.md
@@ -3,7 +3,7 @@ gRPC Unix Abstract Socket Example
 
 This example shows how to use gRPC with Unix domain sockets in the abstract namespace.
 gRPC uses the [`unix-abstract:abstract_path`](https://github.com/grpc/grpc/blob/c6844099218b147b0e374843e0a26745adc61ddb/doc/naming.md?plain=1#L44-L50) URI scheme to support this.
-In this example, an socket with an embedded null character `grpc%00abstract` is created.
+In this example, a socket with an embedded null character `grpc%00abstract` is created.
 
 ## Build and run the example
 
diff --git a/src/cpp/README.md b/src/cpp/README.md
index a999068fb75..45eb3a43301 100755
--- a/src/cpp/README.md
+++ b/src/cpp/README.md
@@ -18,7 +18,7 @@ Therefore, gRPC supports several major build systems, which should satisfy most
   them.
   .
 
-* Best Effort: We do not have continous integration tests for these, but we are
+* Best Effort: We do not have continuous integration tests for these, but we are
   fairly confident that gRPC C++ would work on them. We will make our best
   effort to support them, and we welcome patches for such platforms, but we
   might need to declare bankruptcy on some issues.
diff --git a/src/cpp/ext/filters/census/server_call_tracer.cc b/src/cpp/ext/filters/census/server_call_tracer.cc
index bb6fb57f793..7e60733c80e 100644
--- a/src/cpp/ext/filters/census/server_call_tracer.cc
+++ b/src/cpp/ext/filters/census/server_call_tracer.cc
@@ -194,7 +194,7 @@ class OpenCensusServerCallTracer : public grpc_core::ServerCallTracer {
   absl::Duration elapsed_time_;
   uint64_t recv_message_count_;
   uint64_t sent_message_count_;
-  // Buffer needed for grpc_slice to reference it when adding metatdata to
+  // Buffer needed for grpc_slice to reference it when adding metadata to
   // response.
   char stats_buf_[kMaxServerStatsLen];
   // TODO(roth, ctiller): Won't need atomic here once chttp2 is migrated
diff --git a/src/cpp/ext/gcp/observability_config.cc b/src/cpp/ext/gcp/observability_config.cc
index 64246249f01..0c04ba912af 100644
--- a/src/cpp/ext/gcp/observability_config.cc
+++ b/src/cpp/ext/gcp/observability_config.cc
@@ -75,7 +75,7 @@ absl::StatusOr<std::string> GetGcpObservabilityConfigContents() {
 // Tries to get the GCP Project ID from environment variables, or returns an
 // empty string if not found.
 std::string GetProjectIdFromGcpEnvVar() {
-  // First check GCP_PROEJCT
+  // First check GCP_PROJECT
   absl::optional<std::string> project_id = grpc_core::GetEnv("GCP_PROJECT");
   if (project_id.has_value() && !project_id->empty()) {
     return project_id.value();
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 49cb31dcb48..2d30879de66 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -530,7 +530,7 @@ class Server::SyncRequest final : public grpc::internal::CompletionQueueTag {
   grpc::internal::InterceptorBatchMethodsImpl interceptor_methods_;
 
   // ServerContextWrapper allows ManualConstructor while using a private
-  // contructor of ServerContext via this friend class.
+  // constructor of ServerContext via this friend class.
   struct ServerContextWrapper {
     ServerContext ctx;
 
diff --git a/src/cpp/thread_manager/thread_manager.h b/src/cpp/thread_manager/thread_manager.h
index 2c201bc6098..b42c0b5bb52 100644
--- a/src/cpp/thread_manager/thread_manager.h
+++ b/src/cpp/thread_manager/thread_manager.h
@@ -42,10 +42,10 @@ class ThreadManager {
 
   // "Polls" for new work.
   // If the return value is WORK_FOUND:
-  //  - The implementaion of PollForWork() MAY set some opaque identifier to
+  //  - The implementation of PollForWork() MAY set some opaque identifier to
   //    (identify the work item found) via the '*tag' parameter
-  //  - The implementaion MUST set the value of 'ok' to 'true' or 'false'. A
-  //    value of 'false' indicates some implemenation specific error (that is
+  //  - The implementation MUST set the value of 'ok' to 'true' or 'false'. A
+  //    value of 'false' indicates some implementation specific error (that is
   //    neither SHUTDOWN nor TIMEOUT)
   //  - ThreadManager does not interpret the values of 'tag' and 'ok'
   //  - ThreadManager WILL call DoWork() and pass '*tag' and 'ok' as input to
diff --git a/templates/test/cpp/naming/resolver_component_tests_defs.include b/templates/test/cpp/naming/resolver_component_tests_defs.include
index 019686b2b64..31323950026 100644
--- a/templates/test/cpp/naming/resolver_component_tests_defs.include
+++ b/templates/test/cpp/naming/resolver_component_tests_defs.include
@@ -92,7 +92,7 @@ def wait_until_dns_server_is_up(args,
   dns_server_subprocess.kill()
   dns_server_subprocess.wait()
   test_runner_log(('Failed to reach DNS server over TCP and/or UDP. '
-                   'Exitting without running tests.'))
+                   'Exiting without running tests.'))
   test_runner_log('======= DNS server stdout '
                   '(merged stdout and stderr) =============')
   with open(dns_server_subprocess_output, 'r') as l:
diff --git a/test/cpp/README-iOS.md b/test/cpp/README-iOS.md
index 188b66ed1e1..95fb3ca074f 100644
--- a/test/cpp/README-iOS.md
+++ b/test/cpp/README-iOS.md
@@ -5,7 +5,7 @@ However, it's ok to call `::testing::InitGoogleTest` in `main`, as `GTMGoogleTes
 `grpc::testing::TestEnvironment` can also be called from `main`, as it does some test initialization (install crash handler, seed RNG) that's not strictly required to run testcases on iOS.
 
 
-## Porting exising C++ tests to run on iOS
+## Porting existing C++ tests to run on iOS
 
 Please follow these guidelines when porting tests to run on iOS:
 
diff --git a/test/cpp/cocoapods/Podfile b/test/cpp/cocoapods/Podfile
index 5a2abc4a1a4..273a0157ed0 100644
--- a/test/cpp/cocoapods/Podfile
+++ b/test/cpp/cocoapods/Podfile
@@ -25,7 +25,7 @@ post_install do |installer|
 
     # CocoaPods creates duplicated library targets of gRPC-Core when the test targets include
     # non-default subspecs of gRPC-Core. All of these library targets start with prefix 'gRPC-Core'
-    # and require the same error suppresion.
+    # and require the same error suppression.
     if target.name.start_with?('gRPC-Core')
       target.build_configurations.each do |config|
         # TODO(zyc): Remove this setting after the issue is resolved
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc
index 22b46c08f14..d964042f37a 100644
--- a/test/cpp/end2end/async_end2end_test.cc
+++ b/test/cpp/end2end/async_end2end_test.cc
@@ -234,7 +234,7 @@ bool plugin_has_sync_methods(std::unique_ptr<ServerBuilderPlugin>& plugin) {
 }
 
 // This class disables the server builder plugins that may add sync services to
-// the server. If there are sync services, UnimplementedRpc test will triger
+// the server. If there are sync services, UnimplementedRpc test will trigger
 // the sync unknown rpc routine on the server side, rather than the async one
 // that needs to be tested here.
 class ServerBuilderSyncPluginDisabler : public grpc::ServerBuilderOption {
@@ -322,7 +322,7 @@ class AsyncEnd2endTest : public ::testing::TestWithParam<TestScenario> {
     }
     cq_ = builder.AddCompletionQueue();
 
-    // TODO(zyc): make a test option to choose wheather sync plugins should be
+    // TODO(zyc): make a test option to choose whether sync plugins should be
     // deleted
     std::unique_ptr<ServerBuilderOption> sync_plugin_disabler(
         new ServerBuilderSyncPluginDisabler());
diff --git a/test/cpp/end2end/cfstream_test.cc b/test/cpp/end2end/cfstream_test.cc
index cba2e4f7ddd..35b8b3304a9 100644
--- a/test/cpp/end2end/cfstream_test.cc
+++ b/test/cpp/end2end/cfstream_test.cc
@@ -312,7 +312,7 @@ std::vector<TestScenario> CreateTestScenarios() {
 INSTANTIATE_TEST_SUITE_P(CFStreamTest, CFStreamTest,
                          ::testing::ValuesIn(CreateTestScenarios()));
 
-// gRPC should automatically detech network flaps (without enabling keepalives)
+// gRPC should automatically detect network flaps (without enabling keepalives)
 //  when CFStream is enabled
 TEST_P(CFStreamTest, NetworkTransition) {
   auto channel = BuildChannel();
diff --git a/test/cpp/end2end/channelz_service_test.cc b/test/cpp/end2end/channelz_service_test.cc
index 34a89831904..62839f425f4 100644
--- a/test/cpp/end2end/channelz_service_test.cc
+++ b/test/cpp/end2end/channelz_service_test.cc
@@ -216,7 +216,7 @@ class ChannelzServerTest : public ::testing::TestWithParam<CredentialsType> {
     backends_.clear();
     proxy_service_.reset();
     // Ensure all pending callbacks are handled before finishing the test
-    // to ensure hygene between test cases.
+    // to ensure hygiene between test cases.
     // (requires any grpc-object-holding values be cleared out first).
     grpc_event_engine::experimental::WaitForSingleOwner(
         grpc_event_engine::experimental::GetDefaultEventEngine());
diff --git a/test/cpp/end2end/client_callback_end2end_test.cc b/test/cpp/end2end/client_callback_end2end_test.cc
index 1df284f3b66..f209314be22 100644
--- a/test/cpp/end2end/client_callback_end2end_test.cc
+++ b/test/cpp/end2end/client_callback_end2end_test.cc
@@ -1055,7 +1055,7 @@ TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelDuring) {
   }
 }
 
-// Server to cancel after writing all the respones to the stream but before
+// Server to cancel after writing all the responses to the stream but before
 // returning to the client
 TEST_P(ClientCallbackEnd2endTest, ResponseStreamServerCancelAfter) {
   ResetStub();
diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc
index a72c77b319f..1ea1041e1af 100644
--- a/test/cpp/end2end/client_lb_end2end_test.cc
+++ b/test/cpp/end2end/client_lb_end2end_test.cc
@@ -1021,7 +1021,7 @@ TEST_F(PickFirstTest, BackOffMinReconnect) {
   const grpc_core::Duration waited =
       grpc_core::Duration::FromTimespec(gpr_time_sub(t1, t0));
   VLOG(2) << "Waited " << waited.millis() << " milliseconds";
-  // We should have waited at least kMinReconnectBackOffMs. We substract one to
+  // We should have waited at least kMinReconnectBackOffMs. We subtract one to
   // account for test and precision accuracy drift.
   EXPECT_GE(waited.millis(),
             (kMinReconnectBackOffMs * grpc_test_slowdown_factor()) - 1);
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 818a643b089..88829e477ff 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -786,7 +786,7 @@ TEST_P(End2endServerTryCancelTest, ResponseStreamServerCancelDuring) {
   TestResponseStreamServerCancel(CANCEL_DURING_PROCESSING);
 }
 
-// Server to cancel after writing all the respones to the stream but before
+// Server to cancel after writing all the responses to the stream but before
 // returning to the client
 TEST_P(End2endServerTryCancelTest, ResponseStreamServerCancelAfter) {
   TestResponseStreamServerCancel(CANCEL_AFTER_PROCESSING);
diff --git a/test/cpp/end2end/proto_server_reflection_test.cc b/test/cpp/end2end/proto_server_reflection_test.cc
index 1b4f8d9bd07..6b5aa6fa183 100644
--- a/test/cpp/end2end/proto_server_reflection_test.cc
+++ b/test/cpp/end2end/proto_server_reflection_test.cc
@@ -147,7 +147,7 @@ TEST_F(ProtoServerReflectionTest, CheckResponseWithLocalDescriptorPool) {
 
   std::vector<std::string> services;
   desc_db_->GetServices(&services);
-  // The service list has at least one service (reflection servcie).
+  // The service list has at least one service (reflection service).
   EXPECT_TRUE(!services.empty());
 
   for (auto it = services.begin(); it != services.end(); ++it) {
diff --git a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
index 1c99747b18d..9390f430c04 100644
--- a/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_outlier_detection_end2end_test.cc
@@ -185,7 +185,7 @@ TEST_P(OutlierDetectionTest, SuccessRateMaxPercent) {
     EXPECT_LE(absl::Now(), deadline);
     if (absl::Now() >= deadline) break;
   }
-  // 1 backend should be ejected, trafficed picked up by another backend.
+  // 1 backend should be ejected, traffic picked up by another backend.
   // No other backend should be ejected.
   ResetBackendCounters();
   CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options);
@@ -599,7 +599,7 @@ TEST_P(OutlierDetectionTest, FailurePercentageMaxPercentage) {
     EXPECT_LE(absl::Now(), deadline);
     if (absl::Now() >= deadline) break;
   }
-  // 1 backend should be ejected, trafficed picked up by another backend.
+  // 1 backend should be ejected, traffic picked up by another backend.
   // No other backend should be ejected.
   ResetBackendCounters();
   CheckRpcSendOk(DEBUG_LOCATION, 100, rpc_options);
diff --git a/test/cpp/end2end/xds/xds_server.h b/test/cpp/end2end/xds/xds_server.h
index 5ba992abc59..def8cefc159 100644
--- a/test/cpp/end2end/xds/xds_server.h
+++ b/test/cpp/end2end/xds/xds_server.h
@@ -131,9 +131,9 @@ class AdsServiceImpl
   // Sets a callback to be invoked on request messages with respoonse_nonce
   // set.  The callback is passed the resource type and version.
   void SetCheckVersionCallback(
-      std::function<void(absl::string_view, int)> check_version_callack) {
+      std::function<void(absl::string_view, int)> check_version_callback) {
     grpc_core::MutexLock lock(&ads_mu_);
-    check_version_callack_ = std::move(check_version_callack);
+    check_version_callback_ = std::move(check_version_callback);
   }
 
   // Get the list of response state for each resource type.
@@ -368,9 +368,9 @@ class AdsServiceImpl
         CHECK(absl::SimpleAtoi(request.version_info(),
                                &client_resource_type_version));
       }
-      if (check_version_callack_ != nullptr) {
-        check_version_callack_(request.type_url(),
-                               client_resource_type_version);
+      if (check_version_callback_ != nullptr) {
+        check_version_callback_(request.type_url(),
+                                client_resource_type_version);
       }
     } else {
       int client_nonce;
@@ -586,7 +586,7 @@ class AdsServiceImpl
       resource_type_response_state_ ABSL_GUARDED_BY(ads_mu_);
   std::set<std::string /*resource_type*/> resource_types_to_ignore_
       ABSL_GUARDED_BY(ads_mu_);
-  std::function<void(absl::string_view, int)> check_version_callack_
+  std::function<void(absl::string_view, int)> check_version_callback_
       ABSL_GUARDED_BY(ads_mu_);
   // An instance data member containing the current state of all resources.
   // Note that an entry will exist whenever either of the following is true:
diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h
index 2cf3fa81b10..1abbb61668f 100644
--- a/test/cpp/interop/interop_client.h
+++ b/test/cpp/interop/interop_client.h
@@ -116,7 +116,7 @@ class InteropClient {
    public:
     typedef std::function<std::shared_ptr<Channel>()> ChannelCreationFunc;
     // If new_stub_every_call = true, pointer to a new instance of
-    // TestServce::Stub is returned by Get() everytime it is called
+    // TestService::Stub is returned by Get() everytime it is called
     ServiceStub(ChannelCreationFunc channel_creation_func,
                 bool new_stub_every_call);
 
diff --git a/test/cpp/interop/istio_echo_server.cc b/test/cpp/interop/istio_echo_server.cc
index f661911f3e3..61ec78a5033 100644
--- a/test/cpp/interop/istio_echo_server.cc
+++ b/test/cpp/interop/istio_echo_server.cc
@@ -151,11 +151,11 @@ void RunServer(const std::set<int>& grpc_ports, const std::set<int>& xds_ports,
 
 int main(int argc, char** argv) {
   //  Preprocess argv, for two things:
-  //  1. merge duplciate flags. So "--grpc=8080 --grpc=9090" becomes
+  //  1. merge duplicate flags. So "--grpc=8080 --grpc=9090" becomes
   //  "--grpc=8080,9090".
   //  2. replace '-' to '_'. So "--istio-version=123" becomes
   //  "--istio_version=123".
-  //  3. remove --version since that is specially interpretted by absl
+  //  3. remove --version since that is specially interpreted by absl
   std::map<std::string, std::vector<std::string>> argv_dict;
   for (int i = 0; i < argc; i++) {
     std::string arg(argv[i]);
diff --git a/test/cpp/interop/metrics_client.cc b/test/cpp/interop/metrics_client.cc
index 06352eaed6b..1876f90cf98 100644
--- a/test/cpp/interop/metrics_client.cc
+++ b/test/cpp/interop/metrics_client.cc
@@ -32,7 +32,7 @@
 int kDeadlineSecs = 10;
 
 ABSL_FLAG(std::string, metrics_server_address, "localhost:8081",
-          "The metrics server addresses in the fomrat <hostname>:<port>");
+          "The metrics server addresses in the format <hostname>:<port>");
 // TODO(Capstan): Consider using absl::Duration
 ABSL_FLAG(int32_t, deadline_secs, kDeadlineSecs,
           "The deadline (in seconds) for RCP call");
diff --git a/test/cpp/microbenchmarks/bm_event_engine_run.cc b/test/cpp/microbenchmarks/bm_event_engine_run.cc
index 752d9d440e9..418d88b9d32 100644
--- a/test/cpp/microbenchmarks/bm_event_engine_run.cc
+++ b/test/cpp/microbenchmarks/bm_event_engine_run.cc
@@ -100,7 +100,7 @@ void BM_EventEngine_RunClosure(benchmark::State& state) {
   int cb_count = state.range(0);
   grpc_core::Notification* signal = new grpc_core::Notification();
   std::atomic_int count{0};
-  // Ignore leaks from this closure. For simplicty, this closure is not deleted
+  // Ignore leaks from this closure. For simplicity, this closure is not deleted
   // because the closure may still be executing after the EventEngine is
   // destroyed. This is because the default posix EventEngine's thread pool may
   // get destroyed separately from the EventEngine.
diff --git a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
index fd2e0a001c6..4a18d7a1cec 100644
--- a/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
+++ b/test/cpp/microbenchmarks/fullstack_streaming_ping_pong.h
@@ -42,7 +42,7 @@ static void* tag(intptr_t x) { return reinterpret_cast<void*>(x); }
 // Repeatedly makes Streaming Bidi calls (exchanging a configurable number of
 // messages in each call) in a loop on a single channel
 //
-//  First parmeter (i.e state.range(0)):  Message size (in bytes) to use
+//  First parameter (i.e state.range(0)):  Message size (in bytes) to use
 //  Second parameter (i.e state.range(1)): Number of ping pong messages.
 //      Note: One ping-pong means two messages (one from client to server and
 //      the other from server to client):
@@ -138,7 +138,7 @@ static void BM_StreamingPingPong(benchmark::State& state) {
 }
 
 // Repeatedly sends ping pong messages in a single streaming Bidi call in a loop
-//     First parmeter (i.e state.range(0)):  Message size (in bytes) to use
+//     First parameter (i.e state.range(0)):  Message size (in bytes) to use
 template <class Fixture, class ClientContextMutator, class ServerContextMutator>
 static void BM_StreamingPingPongMsgs(benchmark::State& state) {
   const int msg_size = state.range(0);
@@ -229,7 +229,7 @@ static void BM_StreamingPingPongMsgs(benchmark::State& state) {
 // sendmsg syscalls for streaming by coalescing 1. initial metadata with first
 // message; 2. final streaming message with trailing metadata.
 //
-//  First parmeter (i.e state.range(0)):  Message size (in bytes) to use
+//  First parameter (i.e state.range(0)):  Message size (in bytes) to use
 //  Second parameter (i.e state.range(1)): Number of ping pong messages.
 //      Note: One ping-pong means two messages (one from client to server and
 //      the other from server to client):
diff --git a/test/cpp/naming/resolver_component_tests_runner.py b/test/cpp/naming/resolver_component_tests_runner.py
index f6a32a646c4..ad36616dea0 100755
--- a/test/cpp/naming/resolver_component_tests_runner.py
+++ b/test/cpp/naming/resolver_component_tests_runner.py
@@ -92,7 +92,7 @@ def wait_until_dns_server_is_up(args,
   dns_server_subprocess.kill()
   dns_server_subprocess.wait()
   test_runner_log(('Failed to reach DNS server over TCP and/or UDP. '
-                   'Exitting without running tests.'))
+                   'Exiting without running tests.'))
   test_runner_log('======= DNS server stdout '
                   '(merged stdout and stderr) =============')
   with open(dns_server_subprocess_output, 'r') as l:
diff --git a/test/cpp/naming/resolver_component_tests_runner_invoker.cc b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
index 4c095a7d4bf..64d83864640 100644
--- a/test/cpp/naming/resolver_component_tests_runner_invoker.cc
+++ b/test/cpp/naming/resolver_component_tests_runner_invoker.cc
@@ -112,7 +112,7 @@ int main(int argc, char** argv) {
         test_srcdir.value() +
         absl::GetFlag(FLAGS_grpc_test_directory_relative_to_test_srcdir) +
         std::string("/test/cpp/naming");
-    // Invoke bazel's executeable links to the .sh and .py scripts (don't use
+    // Invoke bazel's executable links to the .sh and .py scripts (don't use
     // the .sh and .py suffixes) to make
     // sure that we're using bazel's test environment.
     result = grpc::testing::InvokeResolverComponentTestsRunner(
diff --git a/test/cpp/naming/utils/dns_server.py b/test/cpp/naming/utils/dns_server.py
index f9c118df7a1..a6692a63dbc 100755
--- a/test/cpp/naming/utils/dns_server.py
+++ b/test/cpp/naming/utils/dns_server.py
@@ -154,7 +154,7 @@ def flush_stdout_loop():
         sys.stdout.flush()
         time.sleep(sleep_time)
         num_timeouts_so_far += 1
-    print("Process timeout reached, or cancelled. Exitting 0.")
+    print("Process timeout reached, or cancelled. Exiting 0.")
     os.kill(os.getpid(), signal.SIGTERM)
 
 
diff --git a/test/cpp/naming/utils/health_check.py b/test/cpp/naming/utils/health_check.py
index e754571db30..b8d7c354027 100755
--- a/test/cpp/naming/utils/health_check.py
+++ b/test/cpp/naming/utils/health_check.py
@@ -86,7 +86,7 @@ def wait_until_dns_server_is_up(args):
     test_runner_log(
         (
             "Failed to reach DNS server over TCP and/or UDP. "
-            "Exitting without running tests."
+            "Exiting without running tests."
         )
     )
     sys.exit(1)
diff --git a/test/cpp/qps/qps_json_driver.cc b/test/cpp/qps/qps_json_driver.cc
index 4614eacf663..1fce38a0575 100644
--- a/test/cpp/qps/qps_json_driver.cc
+++ b/test/cpp/qps/qps_json_driver.cc
@@ -103,8 +103,9 @@ ConstructPerWorkerCredentialTypesMap() {
     }
     size_t comma = next_entry.find(',');
     if (comma == std::string::npos) {
-      LOG(ERROR) << "Expectd --per_worker_credential_types to be a list of the "
-                    "form: 'addr1,cred_type1;addr2,cred_type2;...' into.";
+      LOG(ERROR)
+          << "Expected --per_worker_credential_types to be a list of the "
+             "form: 'addr1,cred_type1;addr2,cred_type2;...' into.";
       abort();
     }
     std::string addr = next_entry.substr(0, comma);
diff --git a/test/cpp/server/load_reporter/load_data_store_test.cc b/test/cpp/server/load_reporter/load_data_store_test.cc
index 454a9b6a161..5e8a6027cc4 100644
--- a/test/cpp/server/load_reporter/load_data_store_test.cc
+++ b/test/cpp/server/load_reporter/load_data_store_test.cc
@@ -132,7 +132,7 @@ TEST_F(LoadDataStoreTest, ReassignOrphanStores) {
   auto assigned_to_lb_id_4 =
       load_data_store.GetAssignedStores(kHostname2, kLbId4);
   // There is no active LB for the first host now. kLbId4 is active but
-  // it's for the second host, so it wll NOT adopt the orphaned stores.
+  // it's for the second host, so it will NOT adopt the orphaned stores.
   EXPECT_FALSE(PerBalancerStoresContains(load_data_store, assigned_to_lb_id_4,
                                          kHostname1, kLbId1, kLoadKey1));
   EXPECT_FALSE(PerBalancerStoresContains(load_data_store, assigned_to_lb_id_4,
@@ -187,16 +187,16 @@ TEST_F(LoadDataStoreTest, OrphanAssignmentIsSticky) {
   // Close the assigned_lb_id, orphaned_lb_id will be re-assigned again.
   load_data_store.ReportStreamClosed(kHostname1, assigned_lb_id);
   active_lb_ids.erase(assigned_lb_id);
-  size_t orphaned_lb_id_occurences = 0;
+  size_t orphaned_lb_id_occurrences = 0;
   for (const auto& lb_id : active_lb_ids) {
     if (PerBalancerStoresContains(
             load_data_store,
             load_data_store.GetAssignedStores(kHostname1, lb_id), kHostname1,
             orphaned_lb_id, kLoadKey1)) {
-      orphaned_lb_id_occurences++;
+      orphaned_lb_id_occurrences++;
     }
   }
-  EXPECT_EQ(orphaned_lb_id_occurences, 1U);
+  EXPECT_EQ(orphaned_lb_id_occurrences, 1U);
 }
 
 TEST_F(LoadDataStoreTest, HostTemporarilyLoseAllStreams) {
diff --git a/test/cpp/util/cli_call.h b/test/cpp/util/cli_call.h
index bb13e5e809c..16d5acbb663 100644
--- a/test/cpp/util/cli_call.h
+++ b/test/cpp/util/cli_call.h
@@ -80,7 +80,7 @@ class CliCall final {
   void WritesDoneAndWait();
 
   // Thread-safe Read. Blockingly receive a generic response message. Notify
-  // writes if they are finished when this read is waiting for a resposne.
+  // writes if they are finished when this read is waiting for a response.
   bool ReadAndMaybeNotifyWrite(
       std::string* response,
       IncomingMetadataContainer* server_initial_metadata);
@@ -97,7 +97,7 @@ class CliCall final {
   grpc::CompletionQueue cq_;
   gpr_mu write_mu_;
   gpr_cv write_cv_;  // Protected by write_mu_;
-  bool write_done_;  // Portected by write_mu_;
+  bool write_done_;  // Protected by write_mu_;
 };
 
 }  // namespace testing
diff --git a/test/distrib/cpp/run_distrib_test_cmake.bat b/test/distrib/cpp/run_distrib_test_cmake.bat
index ec8828e1fd7..7c382552222 100644
--- a/test/distrib/cpp/run_distrib_test_cmake.bat
+++ b/test/distrib/cpp/run_distrib_test_cmake.bat
@@ -19,7 +19,7 @@ cd /d %~dp0\..\..\..
 @rem is on PATH. To avoid picking up the older version protoc.exe, we change the path to something non-existent.
 set PATH=%PATH:ProtoC=DontPickupProtoC%
 
-@rem Install into ./testinstall, but use absolute path and foward slashes
+@rem Install into ./testinstall, but use absolute path and forward slashes
 set INSTALL_DIR=%cd:\=/%/testinstall
 
 @rem Download OpenSSL-Win32 originally installed from https://slproweb.com/products/Win32OpenSSL.html
diff --git a/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat b/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
index e4676c018a8..b68ac6bfa7d 100644
--- a/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
+++ b/test/distrib/cpp/run_distrib_test_cmake_for_dll.bat
@@ -19,7 +19,7 @@ cd /d %~dp0\..\..\..
 @rem is on PATH. To avoid picking up the older version protoc.exe, we change the path to something non-existent.
 set PATH=%PATH:ProtoC=DontPickupProtoC%
 
-@rem Install into ./testinstall, but use absolute path and foward slashes
+@rem Install into ./testinstall, but use absolute path and forward slashes
 set INSTALL_DIR=%cd:\=/%/testinstall
 
 @rem Download OpenSSL-Win32 originally installed from https://slproweb.com/products/Win32OpenSSL.html

From 44bd0528c769ae5e469c3f013b0b4d3e59f57718 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 10 Oct 2024 16:04:33 -0700
Subject: [PATCH 55/74] [chaotic-good] Don't add new streams after transport
 closed (#37887)

Prior to this change events could conspire such that newly read streams got added after the AbortWithError() code ran, and so those calls would be orphaned in the transport forever - continuing to hold a ref.

Closes #37887

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37887 from ctiller:flake-fightas-20 2648d7f37f5b10a6b8501b1b0fb02ee1d5a28fac
PiperOrigin-RevId: 684609806
---
 src/core/ext/transport/chaotic_good/server_transport.cc | 4 ++++
 src/core/ext/transport/chaotic_good/server_transport.h  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
index b166d79380f..b28f99cda92 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.cc
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -397,6 +397,7 @@ void ChaoticGoodServerTransport::AbortWithError() {
   // Close all the available pipes.
   outgoing_frames_.MarkClosed();
   ReleasableMutexLock lock(&mu_);
+  aborted_with_error_ = true;
   StreamMap stream_map = std::move(stream_map_);
   stream_map_.clear();
   state_tracker_.SetState(GRPC_CHANNEL_SHUTDOWN,
@@ -439,6 +440,9 @@ absl::Status ChaoticGoodServerTransport::NewStream(
   GRPC_TRACE_LOG(chaotic_good, INFO)
       << "CHAOTIC_GOOD " << this << " NewStream " << stream_id;
   MutexLock lock(&mu_);
+  if (aborted_with_error_) {
+    return absl::UnavailableError("Transport closed");
+  }
   auto it = stream_map_.find(stream_id);
   if (it != stream_map_.end()) {
     return absl::InternalError("Stream already exists");
diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h
index 49fd5ae015f..9148e5dca8b 100644
--- a/src/core/ext/transport/chaotic_good/server_transport.h
+++ b/src/core/ext/transport/chaotic_good/server_transport.h
@@ -143,6 +143,7 @@ class ChaoticGoodServerTransport final : public ServerTransport {
   Mutex mu_;
   // Map of stream incoming server frames, key is stream_id.
   StreamMap stream_map_ ABSL_GUARDED_BY(mu_);
+  bool aborted_with_error_ ABSL_GUARDED_BY(mu_) = false;
   uint32_t last_seen_new_stream_id_ = 0;
   RefCountedPtr<Party> party_;
   ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(mu_){

From 3020e432f9f19652cffbcb14bc7768526e6ee15f Mon Sep 17 00:00:00 2001
From: Nana Pang <ladynana@google.com>
Date: Thu, 10 Oct 2024 17:03:46 -0700
Subject: [PATCH 56/74] [V3 Call filter] Add a void $INTERCEPTOR_NAME(const
 $VALUE_TYPE&) template to support XorFilter V3 conversion.

PiperOrigin-RevId: 684626196
---
 src/core/lib/transport/call_filters.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/core/lib/transport/call_filters.h b/src/core/lib/transport/call_filters.h
index 3dabd20e2f6..bbdfa4a2fed 100644
--- a/src/core/lib/transport/call_filters.h
+++ b/src/core/lib/transport/call_filters.h
@@ -400,6 +400,28 @@ struct AddOpImpl<FilterType, T,
   }
 };
 
+// void $INTERCEPTOR_NAME(const $VALUE_TYPE&)
+template <typename FilterType, typename T,
+          void (FilterType::Call::*impl)(const typename T::element_type&)>
+struct AddOpImpl<FilterType, T,
+                 void (FilterType::Call::*)(const typename T::element_type&),
+                 impl> {
+  static void Add(FilterType* channel_data, size_t call_offset, Layout<T>& to) {
+    to.Add(0, 0,
+           Operator<T>{
+               channel_data,
+               call_offset,
+               [](void*, void* call_data, void*, T value) -> Poll<ResultOr<T>> {
+                 (static_cast<typename FilterType::Call*>(call_data)->*impl)(
+                     *value);
+                 return ResultOr<T>{std::move(value), nullptr};
+               },
+               nullptr,
+               nullptr,
+           });
+  }
+};
+
 // void $INTERCEPTOR_NAME($VALUE_TYPE&, FilterType*)
 template <typename FilterType, typename T,
           void (FilterType::Call::*impl)(typename T::element_type&,

From efde05396827c9d639edd555c7e1f1151d27be5d Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Thu, 10 Oct 2024 17:08:59 -0700
Subject: [PATCH 57/74] Delete `Bazel BinderTransport APK building/testing`
 gRPC CI test

PiperOrigin-RevId: 684627679
---
 ...pc_binder_transport_apk_build_in_docker.sh | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100755 tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh

diff --git a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
deleted file mode 100755
index 300cace3a37..00000000000
--- a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-echo $ANDROID_HOME
-echo $ANDROID_NDK_HOME
-
-# Android platforms only works with Bazel >= 7.0
-export OVERRIDE_BAZEL_VERSION=7.3.1
-
-python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_binder_example_app
-bazel_binder_example_app/bazel_wrapper \
-  --bazelrc=tools/remote_build/include/test_locally_with_resultstore_results.bazelrc \
-  build \
-  --extra_toolchains=@androidndk//:all \
-  --android_platforms=//bazel/platforms/android:x86_64,//bazel/platforms/android:armeabi-v7a,//bazel/platforms/android:arm64-v8a \
-  //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app \
-  //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app
-
-# Make sure the Java code that will be invoked by binder transport
-# implementation builds
-python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_binder_connection_helper
-bazel_binder_connection_helper/bazel_wrapper \
-  --bazelrc=tools/remote_build/include/test_locally_with_resultstore_results.bazelrc \
-  build \
-  --define=use_strict_warning=true \
-  @binder_transport_android_helper//io/grpc/binder/cpp:connection_helper

From 8afaf833e09b61e54b72de9db824425f7eb2adf1 Mon Sep 17 00:00:00 2001
From: Yijie Ma <yijiem@google.com>
Date: Thu, 10 Oct 2024 17:25:43 -0700
Subject: [PATCH 58/74] [EventEngine] Migrate `chttp2_server` to use EE
 DNSResolver (#37853)

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37853

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37853 from yijiem:dns-migration-chttp2-server b830720b2068b42536285fe282e0ebdfe7a1eb61
PiperOrigin-RevId: 684631881
---
 bazel/experiments.bzl                         |  5 ++
 src/core/BUILD                                |  5 ++
 .../transport/chttp2/server/chttp2_server.cc  | 87 ++++++++++++-------
 src/core/lib/event_engine/resolved_address.cc |  3 +
 src/core/lib/event_engine/utils.cc            | 16 ++++
 src/core/lib/event_engine/utils.h             |  7 ++
 src/core/lib/experiments/experiments.cc       | 27 ++++++
 src/core/lib/experiments/experiments.h        |  8 ++
 src/core/lib/experiments/experiments.yaml     |  8 ++
 9 files changed, 136 insertions(+), 30 deletions(-)

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index f9035a02199..c06a4fd3ecb 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -23,6 +23,7 @@ EXPERIMENT_ENABLES = {
     "event_engine_application_callbacks": "event_engine_application_callbacks",
     "event_engine_client": "event_engine_client",
     "event_engine_dns": "event_engine_dns",
+    "event_engine_dns_non_client_channel": "event_engine_dns_non_client_channel",
     "event_engine_listener": "event_engine_listener",
     "free_large_allocator": "free_large_allocator",
     "local_connector_secure": "local_connector_secure",
@@ -44,6 +45,7 @@ EXPERIMENT_ENABLES = {
 EXPERIMENT_POLLERS = [
     "event_engine_client",
     "event_engine_dns",
+    "event_engine_dns_non_client_channel",
     "event_engine_listener",
 ]
 
@@ -53,6 +55,7 @@ EXPERIMENTS = {
         },
         "off": {
             "core_end2end_test": [
+                "event_engine_dns_non_client_channel",
                 "local_connector_secure",
             ],
             "endpoint_test": [
@@ -102,6 +105,7 @@ EXPERIMENTS = {
         },
         "off": {
             "core_end2end_test": [
+                "event_engine_dns_non_client_channel",
                 "local_connector_secure",
             ],
             "endpoint_test": [
@@ -135,6 +139,7 @@ EXPERIMENTS = {
         },
         "off": {
             "core_end2end_test": [
+                "event_engine_dns_non_client_channel",
                 "local_connector_secure",
             ],
             "endpoint_test": [
diff --git a/src/core/BUILD b/src/core/BUILD
index 5f6adbeb898..a3e790fb9f1 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -2371,9 +2371,11 @@ grpc_cc_library(
     hdrs = ["lib/event_engine/utils.h"],
     external_deps = [
         "absl/log:check",
+        "absl/status:statusor",
         "absl/strings",
     ],
     deps = [
+        "notification",
         "time",
         "//:event_engine_base_hdrs",
         "//:gpr_platform",
@@ -7647,8 +7649,11 @@ grpc_cc_library(
         "connection_quota",
         "error",
         "error_utils",
+        "event_engine_common",
         "event_engine_extensions",
         "event_engine_query_extensions",
+        "event_engine_tcp_socket_utils",
+        "event_engine_utils",
         "grpc_insecure_credentials",
         "handshaker_registry",
         "iomgr_fwd",
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index 0486f7e3bf5..aae31551068 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -59,6 +59,9 @@
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
 #include "src/core/lib/event_engine/query_extensions.h"
+#include "src/core/lib/event_engine/resolved_address_internal.h"
+#include "src/core/lib/event_engine/tcp_socket_utils.h"
+#include "src/core/lib/event_engine/utils.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
@@ -113,7 +116,8 @@ using AcceptorPtr = std::unique_ptr<grpc_tcp_server_acceptor, AcceptorDeleter>;
 
 class Chttp2ServerListener : public Server::ListenerInterface {
  public:
-  static grpc_error_handle Create(Server* server, grpc_resolved_address* addr,
+  static grpc_error_handle Create(Server* server,
+                                  const EventEngine::ResolvedAddress& addr,
                                   const ChannelArgs& args,
                                   Chttp2ServerArgsModifier args_modifier,
                                   int* port_num);
@@ -701,8 +705,9 @@ void Chttp2ServerListener::ActiveConnection::OnDrainGraceTimeExpiry() {
 //
 
 grpc_error_handle Chttp2ServerListener::Create(
-    Server* server, grpc_resolved_address* addr, const ChannelArgs& args,
-    Chttp2ServerArgsModifier args_modifier, int* port_num) {
+    Server* server, const EventEngine::ResolvedAddress& addr,
+    const ChannelArgs& args, Chttp2ServerArgsModifier args_modifier,
+    int* port_num) {
   // Create Chttp2ServerListener.
   OrphanablePtr<Chttp2ServerListener> listener =
       MakeOrphanable<Chttp2ServerListener>(server, args, args_modifier,
@@ -714,18 +719,24 @@ grpc_error_handle Chttp2ServerListener::Create(
       &listener->tcp_server_shutdown_complete_, ChannelArgsEndpointConfig(args),
       OnAccept, listener.get(), &listener->tcp_server_);
   if (!error.ok()) return error;
+  // TODO(yijiem): remove this conversion when we remove all
+  // grpc_resolved_address usages.
+  grpc_resolved_address iomgr_addr =
+      grpc_event_engine::experimental::CreateGRPCResolvedAddress(addr);
   if (listener->config_fetcher_ != nullptr) {
-    listener->resolved_address_ = *addr;
+    listener->resolved_address_ = iomgr_addr;
     // TODO(yashykt): Consider binding so as to be able to return the port
     // number.
   } else {
-    error = grpc_tcp_server_add_port(listener->tcp_server_, addr, port_num);
+    error =
+        grpc_tcp_server_add_port(listener->tcp_server_, &iomgr_addr, port_num);
     if (!error.ok()) return error;
   }
   // Create channelz node.
   if (args.GetBool(GRPC_ARG_ENABLE_CHANNELZ)
           .value_or(GRPC_ENABLE_CHANNELZ_DEFAULT)) {
-    auto string_address = grpc_sockaddr_to_uri(addr);
+    auto string_address =
+        grpc_event_engine::experimental::ResolvedAddressToString(addr);
     if (!string_address.ok()) {
       return GRPC_ERROR_CREATE(string_address.status().ToString());
     }
@@ -955,37 +966,53 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr,
                                                     args_modifier);
   }
   *port_num = -1;
-  absl::StatusOr<std::vector<grpc_resolved_address>> resolved_or;
+  absl::StatusOr<std::vector<EventEngine::ResolvedAddress>> results =
+      std::vector<EventEngine::ResolvedAddress>();
   std::vector<grpc_error_handle> error_list;
   std::string parsed_addr = URI::PercentDecode(addr);
   absl::string_view parsed_addr_unprefixed{parsed_addr};
   // Using lambda to avoid use of goto.
   grpc_error_handle error = [&]() {
     grpc_error_handle error;
-    if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix)) {
-      resolved_or = grpc_resolve_unix_domain_address(parsed_addr_unprefixed);
-    } else if (absl::ConsumePrefix(&parsed_addr_unprefixed,
-                                   kUnixAbstractUriPrefix)) {
-      resolved_or =
-          grpc_resolve_unix_abstract_domain_address(parsed_addr_unprefixed);
-    } else if (absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) {
-      resolved_or = grpc_resolve_vsock_address(parsed_addr_unprefixed);
+    if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix) ||
+        absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixAbstractUriPrefix) ||
+        absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) {
+      absl::StatusOr<EventEngine::ResolvedAddress> result =
+          grpc_event_engine::experimental::URIToResolvedAddress(parsed_addr);
+      GRPC_RETURN_IF_ERROR(result.status());
+      results->push_back(*result);
     } else {
-      resolved_or =
-          GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https");
-    }
-    if (!resolved_or.ok()) {
-      return absl_status_to_grpc_error(resolved_or.status());
+      if (IsEventEngineDnsNonClientChannelEnabled()) {
+        absl::StatusOr<std::unique_ptr<EventEngine::DNSResolver>> ee_resolver =
+            args.GetObjectRef<EventEngine>()->GetDNSResolver(
+                EventEngine::DNSResolver::ResolverOptions());
+        GRPC_RETURN_IF_ERROR(ee_resolver.status());
+        results = grpc_event_engine::experimental::LookupHostnameBlocking(
+            ee_resolver->get(), parsed_addr, "https");
+      } else {
+        // TODO(yijiem): Remove this after event_engine_dns_non_client_channel
+        // is fully enabled.
+        absl::StatusOr<std::vector<grpc_resolved_address>> iomgr_results =
+            GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https");
+        GRPC_RETURN_IF_ERROR(iomgr_results.status());
+        for (const auto& addr : *iomgr_results) {
+          results->push_back(
+              grpc_event_engine::experimental::CreateResolvedAddress(addr));
+        }
+      }
     }
+    GRPC_RETURN_IF_ERROR(results.status());
     // Create a listener for each resolved address.
-    for (auto& addr : *resolved_or) {
+    for (EventEngine::ResolvedAddress& addr : *results) {
       // If address has a wildcard port (0), use the same port as a previous
       // listener.
-      if (*port_num != -1 && grpc_sockaddr_get_port(&addr) == 0) {
-        grpc_sockaddr_set_port(&addr, *port_num);
+      if (*port_num != -1 &&
+          grpc_event_engine::experimental::ResolvedAddressGetPort(addr) == 0) {
+        grpc_event_engine::experimental::ResolvedAddressSetPort(addr,
+                                                                *port_num);
       }
       int port_temp = -1;
-      error = Chttp2ServerListener::Create(server, &addr, args, args_modifier,
+      error = Chttp2ServerListener::Create(server, addr, args, args_modifier,
                                            &port_temp);
       if (!error.ok()) {
         error_list.push_back(error);
@@ -997,17 +1024,17 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr,
         }
       }
     }
-    if (error_list.size() == resolved_or->size()) {
+    if (error_list.size() == results->size()) {
       std::string msg = absl::StrFormat(
           "No address added out of total %" PRIuPTR " resolved for '%s'",
-          resolved_or->size(), addr);
+          results->size(), addr);
       return GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(),
                                            error_list.size());
     } else if (!error_list.empty()) {
-      std::string msg = absl::StrFormat(
-          "Only %" PRIuPTR " addresses added out of total %" PRIuPTR
-          " resolved",
-          resolved_or->size() - error_list.size(), resolved_or->size());
+      std::string msg =
+          absl::StrFormat("Only %" PRIuPTR
+                          " addresses added out of total %" PRIuPTR " resolved",
+                          results->size() - error_list.size(), results->size());
       error = GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(),
                                             error_list.size());
       LOG(INFO) << "WARNING: " << StatusToString(error);
diff --git a/src/core/lib/event_engine/resolved_address.cc b/src/core/lib/event_engine/resolved_address.cc
index 1a41663bedd..2672923f8c2 100644
--- a/src/core/lib/event_engine/resolved_address.cc
+++ b/src/core/lib/event_engine/resolved_address.cc
@@ -48,6 +48,9 @@ EventEngine::ResolvedAddress CreateResolvedAddress(
 
 grpc_resolved_address CreateGRPCResolvedAddress(
     const EventEngine::ResolvedAddress& ra) {
+  static_assert(
+      GRPC_MAX_SOCKADDR_SIZE == EventEngine::ResolvedAddress::MAX_SIZE_BYTES,
+      "size should match");
   grpc_resolved_address grpc_addr;
   memset(&grpc_addr, 0, sizeof(grpc_resolved_address));
   memcpy(grpc_addr.addr, ra.address(), ra.size());
diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc
index f2a202315ce..ad4b44a287e 100644
--- a/src/core/lib/event_engine/utils.cc
+++ b/src/core/lib/event_engine/utils.cc
@@ -20,6 +20,7 @@
 #include <algorithm>
 
 #include "absl/strings/str_cat.h"
+#include "src/core/util/notification.h"
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
@@ -38,5 +39,20 @@ grpc_core::Timestamp ToTimestamp(grpc_core::Timestamp now,
          grpc_core::Duration::Milliseconds(1);
 }
 
+absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
+LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver,
+                       absl::string_view name, absl::string_view default_port) {
+  absl::StatusOr<std::vector<EventEngine::ResolvedAddress>> results;
+  grpc_core::Notification done;
+  dns_resolver->LookupHostname(
+      [&](absl::StatusOr<std::vector<EventEngine::ResolvedAddress>> addresses) {
+        results = std::move(addresses);
+        done.Notify();
+      },
+      name, default_port);
+  done.WaitForNotification();
+  return results;
+}
+
 }  // namespace experimental
 }  // namespace grpc_event_engine
diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h
index 45675ee8d88..0e15d69b495 100644
--- a/src/core/lib/event_engine/utils.h
+++ b/src/core/lib/event_engine/utils.h
@@ -19,7 +19,10 @@
 #include <stdint.h>
 
 #include <string>
+#include <vector>
 
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
@@ -36,6 +39,10 @@ std::string HandleToString(const Handle& handle) {
 grpc_core::Timestamp ToTimestamp(grpc_core::Timestamp now,
                                  EventEngine::Duration delta);
 
+absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
+LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver,
+                       absl::string_view name, absl::string_view default_port);
+
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index 664498e252d..7415fac0a9c 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -41,6 +41,11 @@ const char* const additional_constraints_event_engine_client = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
+const char* const description_event_engine_dns_non_client_channel =
+    "If set, use EventEngine DNSResolver in other places besides client "
+    "channel.";
+const char* const additional_constraints_event_engine_dns_non_client_channel =
+    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -118,6 +123,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_event_engine_client, nullptr, 0, false, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, false, false},
+    {"event_engine_dns_non_client_channel",
+     description_event_engine_dns_non_client_channel,
+     additional_constraints_event_engine_dns_non_client_channel, nullptr, 0,
+     false, false},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, nullptr, 0, false, true},
     {"free_large_allocator", description_free_large_allocator,
@@ -182,6 +191,11 @@ const char* const additional_constraints_event_engine_client = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
+const char* const description_event_engine_dns_non_client_channel =
+    "If set, use EventEngine DNSResolver in other places besides client "
+    "channel.";
+const char* const additional_constraints_event_engine_dns_non_client_channel =
+    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -259,6 +273,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_event_engine_client, nullptr, 0, true, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, true, false},
+    {"event_engine_dns_non_client_channel",
+     description_event_engine_dns_non_client_channel,
+     additional_constraints_event_engine_dns_non_client_channel, nullptr, 0,
+     false, false},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, nullptr, 0, true, true},
     {"free_large_allocator", description_free_large_allocator,
@@ -323,6 +341,11 @@ const char* const additional_constraints_event_engine_client = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
+const char* const description_event_engine_dns_non_client_channel =
+    "If set, use EventEngine DNSResolver in other places besides client "
+    "channel.";
+const char* const additional_constraints_event_engine_dns_non_client_channel =
+    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -400,6 +423,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_event_engine_client, nullptr, 0, true, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, true, false},
+    {"event_engine_dns_non_client_channel",
+     description_event_engine_dns_non_client_channel,
+     additional_constraints_event_engine_dns_non_client_channel, nullptr, 0,
+     false, false},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, nullptr, 0, true, true},
     {"free_large_allocator", description_free_large_allocator,
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index f39ff23df80..6662d016e2d 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -65,6 +65,7 @@ inline bool IsClientPrivacyEnabled() { return false; }
 inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
+inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 inline bool IsEventEngineListenerEnabled() { return false; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
@@ -97,6 +98,7 @@ inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
 inline bool IsEventEngineDnsEnabled() { return true; }
+inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
@@ -130,6 +132,7 @@ inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
 inline bool IsEventEngineDnsEnabled() { return true; }
+inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
@@ -162,6 +165,7 @@ enum ExperimentIds {
   kExperimentIdEventEngineApplicationCallbacks,
   kExperimentIdEventEngineClient,
   kExperimentIdEventEngineDns,
+  kExperimentIdEventEngineDnsNonClientChannel,
   kExperimentIdEventEngineListener,
   kExperimentIdFreeLargeAllocator,
   kExperimentIdLocalConnectorSecure,
@@ -204,6 +208,10 @@ inline bool IsEventEngineClientEnabled() {
 inline bool IsEventEngineDnsEnabled() {
   return IsExperimentEnabled<kExperimentIdEventEngineDns>();
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS_NON_CLIENT_CHANNEL
+inline bool IsEventEngineDnsNonClientChannelEnabled() {
+  return IsExperimentEnabled<kExperimentIdEventEngineDnsNonClientChannel>();
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() {
   return IsExperimentEnabled<kExperimentIdEventEngineListener>();
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index 7362efde841..b1c7e56090b 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -77,6 +77,14 @@
   test_tags: ["cancel_ares_query_test", "resolver_component_tests_runner_invoker"]
   allow_in_fuzzing_config: false
   uses_polling: true
+- name: event_engine_dns_non_client_channel
+  description:
+    If set, use EventEngine DNSResolver in other places besides client channel.
+  expiry: 2025/03/01
+  owner: yijiem@google.com
+  test_tags: ["core_end2end_test"]
+  allow_in_fuzzing_config: false
+  uses_polling: true
 - name: event_engine_listener
   description: Use EventEngine listeners instead of iomgr's grpc_tcp_server
   expiry: 2025/03/01

From 1c82b1cbea3ff64d5b487eba7c0f2aeb138a4ea7 Mon Sep 17 00:00:00 2001
From: Richard Belleville <rbellevi@google.com>
Date: Thu, 10 Oct 2024 20:57:19 -0700
Subject: [PATCH 59/74] [Python tooling tests] Disable Python tooling tests
 (#37885)

CC @sourabhsinghs
---
 tools/internal_ci/linux/grpc_toolingtests_python.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/internal_ci/linux/grpc_toolingtests_python.sh b/tools/internal_ci/linux/grpc_toolingtests_python.sh
index 13a7bd5a211..87bebec58df 100755
--- a/tools/internal_ci/linux/grpc_toolingtests_python.sh
+++ b/tools/internal_ci/linux/grpc_toolingtests_python.sh
@@ -23,4 +23,6 @@ export DOCKERFILE_DIR=tools/dockerfile/distribtest/python_dev_ubuntu2204_x64
 export DOCKER_RUN_SCRIPT=tools/distrib/install_python_modules_and_run_tests.sh
 export GRPC_TEST_REPORT_BASE_DIR=reports
 
-exec tools/run_tests/dockerize/build_and_run_docker.sh
+# TODO: Reenable once the underlying test passes.
+true
+# exec tools/run_tests/dockerize/build_and_run_docker.sh

From e808d329aea5d19c38c39581c9eacc39c8df5331 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 11 Oct 2024 10:17:22 -0700
Subject: [PATCH 60/74] [xds_client_test] use real xDS protos instead of local
 copies (#37863)

This is a trial baloon to see if we can actually make this work.  If it does, I'll change the remaining xDS tests to use the real xDS protos and completely remove our local copies.

Closes #37863

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37863 from markdroth:xds_tests_use_real_protos 3ad2fe12be7269fd53fb005fadde79bcf19e5229
PiperOrigin-RevId: 684877750
---
 BUILD                                         |  11 +
 CMakeLists.txt                                | 470 +++++++++++++++++-
 bazel/grpc_build_system.bzl                   |   4 +
 build_autogenerated.yaml                      |  73 ++-
 test/core/xds/BUILD                           |   5 +-
 test/core/xds/xds_client_test.cc              |   4 +-
 .../extract_metadata_from_bazel_xml.py        |   4 +
 7 files changed, 553 insertions(+), 18 deletions(-)

diff --git a/BUILD b/BUILD
index 4d57a053c1f..f5ec7efea92 100644
--- a/BUILD
+++ b/BUILD
@@ -19,6 +19,7 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load(
     "//bazel:grpc_build_system.bzl",
     "grpc_cc_library",
+    "grpc_cc_proto_library",
     "grpc_clang_cl_settings",
     "grpc_filegroup",
     "grpc_generate_one_off_targets",
@@ -4988,6 +4989,11 @@ grpc_upb_proto_reflection_library(
     deps = ["@envoy_api//envoy/config/cluster/v3:pkg"],
 )
 
+grpc_cc_proto_library(
+    name = "envoy_config_core_cc_proto",
+    deps = ["@envoy_api//envoy/config/core/v3:pkg"],
+)
+
 grpc_upb_proto_library(
     name = "envoy_config_core_upb",
     deps = ["@envoy_api//envoy/config/core/v3:pkg"],
@@ -5158,6 +5164,11 @@ grpc_upb_proto_reflection_library(
     deps = ["@envoy_api//envoy/extensions/upstreams/http/v3:pkg"],
 )
 
+grpc_cc_proto_library(
+    name = "envoy_service_discovery_cc_proto",
+    deps = ["@envoy_api//envoy/service/discovery/v3:pkg"],
+)
+
 grpc_upb_proto_library(
     name = "envoy_service_discovery_upb",
     deps = ["@envoy_api//envoy/service/discovery/v3:pkg"],
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41e69b70ab7..cb23c62f13e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -455,6 +455,16 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/opencensus-proto/src AND
     opencensus-proto-0.3.0/src
   )
 endif()
+# Setup external proto library at third_party/protoc-gen-validate if it doesn't exist
+if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/protoc-gen-validate AND gRPC_DOWNLOAD_ARCHIVES)
+  # Download the archive via HTTP, validate the checksum, and extract to third_party/protoc-gen-validate.
+  download_archive(
+    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/protoc-gen-validate
+    https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz
+    1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47
+    protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69
+  )
+endif()
 # Setup external proto library at third_party/xds with 2 download URLs
 if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds AND gRPC_DOWNLOAD_ARCHIVES)
   # Download the archive via HTTP, validate the checksum, and extract to third_party/xds.
@@ -892,6 +902,198 @@ protobuf_generate_grpc_cpp_with_import_path_correction(
 protobuf_generate_grpc_cpp_with_import_path_correction(
   test/core/tsi/alts/fake_handshaker/transport_security_common.proto test/core/tsi/alts/fake_handshaker/transport_security_common.proto
 )
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/annotations/deprecation.proto envoy/annotations/deprecation.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/annotations/resource.proto envoy/annotations/resource.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/address.proto envoy/config/core/v3/address.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/backoff.proto envoy/config/core/v3/backoff.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/base.proto envoy/config/core/v3/base.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/config_source.proto envoy/config/core/v3/config_source.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/event_service_config.proto envoy/config/core/v3/event_service_config.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/extension.proto envoy/config/core/v3/extension.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/grpc_method_list.proto envoy/config/core/v3/grpc_method_list.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/grpc_service.proto envoy/config/core/v3/grpc_service.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/health_check.proto envoy/config/core/v3/health_check.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/http_service.proto envoy/config/core/v3/http_service.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/http_uri.proto envoy/config/core/v3/http_uri.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/protocol.proto envoy/config/core/v3/protocol.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/proxy_protocol.proto envoy/config/core/v3/proxy_protocol.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/resolver.proto envoy/config/core/v3/resolver.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/socket_option.proto envoy/config/core/v3/socket_option.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/substitution_format_string.proto envoy/config/core/v3/substitution_format_string.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/config/core/v3/udp_socket_config.proto envoy/config/core/v3/udp_socket_config.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/service/discovery/v3/ads.proto envoy/service/discovery/v3/ads.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/service/discovery/v3/discovery.proto envoy/service/discovery/v3/discovery.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/filter_state.proto envoy/type/matcher/v3/filter_state.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/http_inputs.proto envoy/type/matcher/v3/http_inputs.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/metadata.proto envoy/type/matcher/v3/metadata.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/node.proto envoy/type/matcher/v3/node.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/number.proto envoy/type/matcher/v3/number.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/path.proto envoy/type/matcher/v3/path.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/regex.proto envoy/type/matcher/v3/regex.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/status_code_input.proto envoy/type/matcher/v3/status_code_input.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/string.proto envoy/type/matcher/v3/string.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/struct.proto envoy/type/matcher/v3/struct.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/matcher/v3/value.proto envoy/type/matcher/v3/value.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/hash_policy.proto envoy/type/v3/hash_policy.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/http.proto envoy/type/v3/http.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/http_status.proto envoy/type/v3/http_status.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/percent.proto envoy/type/v3/percent.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/range.proto envoy/type/v3/range.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/ratelimit_strategy.proto envoy/type/v3/ratelimit_strategy.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/ratelimit_unit.proto envoy/type/v3/ratelimit_unit.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/semantic_version.proto envoy/type/v3/semantic_version.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/envoy-api/envoy/type/v3/token_bucket.proto envoy/type/v3/token_bucket.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/googleapis/google/api/annotations.proto google/api/annotations.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/googleapis/google/api/http.proto google/api/http.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/googleapis/google/api/httpbody.proto google/api/httpbody.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/googleapis/google/rpc/status.proto google/rpc/status.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/protoc-gen-validate/validate/validate.proto validate/validate.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/udpa/annotations/migrate.proto udpa/annotations/migrate.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/udpa/annotations/security.proto udpa/annotations/security.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/udpa/annotations/sensitive.proto udpa/annotations/sensitive.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/udpa/annotations/status.proto udpa/annotations/status.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/udpa/annotations/versioning.proto udpa/annotations/versioning.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/annotations/v3/migrate.proto xds/annotations/v3/migrate.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/annotations/v3/security.proto xds/annotations/v3/security.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/annotations/v3/sensitive.proto xds/annotations/v3/sensitive.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/annotations/v3/status.proto xds/annotations/v3/status.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/annotations/v3/versioning.proto xds/annotations/v3/versioning.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/authority.proto xds/core/v3/authority.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/cidr.proto xds/core/v3/cidr.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/collection_entry.proto xds/core/v3/collection_entry.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/context_params.proto xds/core/v3/context_params.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/extension.proto xds/core/v3/extension.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/resource.proto xds/core/v3/resource.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/resource_locator.proto xds/core/v3/resource_locator.proto
+)
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  third_party/xds/xds/core/v3/resource_name.proto xds/core/v3/resource_name.proto
+)
 
 if(gRPC_BUILD_TESTS)
   add_custom_target(buildtests_c)
@@ -34181,22 +34383,266 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(xds_client_test
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.h
   ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.cc
   ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.cc
   ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h
   ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/deprecation.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/deprecation.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/deprecation.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/deprecation.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/resource.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/resource.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/resource.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/annotations/resource.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/address.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/address.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/address.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/address.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/backoff.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/backoff.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/backoff.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/backoff.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/base.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/base.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/base.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/base.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/config_source.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/config_source.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/config_source.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/config_source.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/event_service_config.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/event_service_config.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/event_service_config.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/event_service_config.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/extension.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/extension.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/extension.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/extension.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_method_list.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_method_list.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_method_list.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_method_list.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_service.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_service.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_service.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/grpc_service.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/health_check.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/health_check.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/health_check.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/health_check.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_service.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_service.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_service.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_service.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_uri.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_uri.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_uri.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/http_uri.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/protocol.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/protocol.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/protocol.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/protocol.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/proxy_protocol.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/proxy_protocol.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/proxy_protocol.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/proxy_protocol.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/resolver.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/resolver.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/resolver.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/resolver.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/socket_option.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/socket_option.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/socket_option.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/socket_option.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/substitution_format_string.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/substitution_format_string.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/substitution_format_string.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/substitution_format_string.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/udp_socket_config.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/udp_socket_config.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/udp_socket_config.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/config/core/v3/udp_socket_config.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/ads.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/ads.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/ads.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/ads.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/discovery.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/discovery.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/discovery.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/service/discovery/v3/discovery.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/filter_state.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/filter_state.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/filter_state.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/filter_state.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/http_inputs.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/http_inputs.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/http_inputs.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/http_inputs.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/metadata.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/metadata.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/metadata.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/metadata.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/node.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/node.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/node.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/node.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/number.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/number.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/number.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/number.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/path.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/path.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/path.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/path.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/regex.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/regex.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/regex.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/regex.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/status_code_input.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/status_code_input.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/status_code_input.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/status_code_input.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/string.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/string.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/string.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/string.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/struct.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/struct.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/struct.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/struct.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/value.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/value.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/value.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/matcher/v3/value.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/hash_policy.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/hash_policy.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/hash_policy.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/hash_policy.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http_status.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http_status.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http_status.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/http_status.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/percent.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/percent.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/percent.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/percent.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/range.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/range.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/range.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/range.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_strategy.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_strategy.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_strategy.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_strategy.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_unit.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_unit.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_unit.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/ratelimit_unit.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/semantic_version.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/semantic_version.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/semantic_version.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/semantic_version.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/token_bucket.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/token_bucket.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/token_bucket.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/envoy/type/v3/token_bucket.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/api/annotations.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/api/annotations.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/api/annotations.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/api/annotations.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/api/http.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/api/http.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/api/http.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/api/http.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/api/httpbody.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/api/httpbody.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/api/httpbody.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/api/httpbody.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/rpc/status.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/rpc/status.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/google/rpc/status.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/google/rpc/status.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/validate/validate.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/validate/validate.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/validate/validate.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/validate/validate.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/migrate.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/migrate.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/migrate.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/migrate.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/security.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/security.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/security.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/security.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/sensitive.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/sensitive.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/sensitive.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/sensitive.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/status.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/status.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/status.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/status.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/versioning.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/versioning.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/versioning.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/udpa/annotations/versioning.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/migrate.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/migrate.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/migrate.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/migrate.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/security.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/security.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/security.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/security.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/sensitive.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/sensitive.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/sensitive.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/sensitive.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/status.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/status.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/status.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/status.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/versioning.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/versioning.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/versioning.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/annotations/v3/versioning.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/authority.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/authority.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/authority.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/authority.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/cidr.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/cidr.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/cidr.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/cidr.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/collection_entry.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/collection_entry.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/collection_entry.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/collection_entry.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/context_params.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/context_params.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/context_params.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/context_params.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/extension.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/extension.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/extension.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/extension.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_locator.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_locator.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_locator.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_locator.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_name.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_name.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_name.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/xds/core/v3/resource_name.grpc.pb.h
   src/cpp/client/global_callback_hook.cc
   src/cpp/util/status.cc
   test/core/event_engine/event_engine_test_utils.cc
diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index a90113e2f29..92f720ff14e 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -29,6 +29,7 @@ Contains macros used throughout the repo.
 
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
 load("@build_bazel_rules_apple//apple/testing/default_runner:ios_test_runner.bzl", "ios_test_runner")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("@com_google_protobuf//bazel:upb_proto_library.bzl", "upb_proto_library", "upb_proto_reflection_library")
 load("//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("//bazel:copts.bzl", "GRPC_DEFAULT_COPTS")
@@ -793,6 +794,9 @@ def grpc_objc_library(
         visibility = visibility,
     )
 
+def grpc_cc_proto_library(name, deps):
+    cc_proto_library(name = name, deps = deps)
+
 def grpc_upb_proto_library(name, deps):
     upb_proto_library(name = name, deps = deps)
 
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 785776254f8..1f4d3af67cb 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -21570,10 +21570,71 @@ targets:
   - test/core/xds/xds_client_test_peer.h
   - test/core/xds/xds_transport_fake.h
   src:
-  - src/proto/grpc/testing/xds/v3/base.proto
-  - src/proto/grpc/testing/xds/v3/discovery.proto
-  - src/proto/grpc/testing/xds/v3/percent.proto
   - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto
+  - third_party/envoy-api/envoy/annotations/deprecation.proto
+  - third_party/envoy-api/envoy/annotations/resource.proto
+  - third_party/envoy-api/envoy/config/core/v3/address.proto
+  - third_party/envoy-api/envoy/config/core/v3/backoff.proto
+  - third_party/envoy-api/envoy/config/core/v3/base.proto
+  - third_party/envoy-api/envoy/config/core/v3/config_source.proto
+  - third_party/envoy-api/envoy/config/core/v3/event_service_config.proto
+  - third_party/envoy-api/envoy/config/core/v3/extension.proto
+  - third_party/envoy-api/envoy/config/core/v3/grpc_method_list.proto
+  - third_party/envoy-api/envoy/config/core/v3/grpc_service.proto
+  - third_party/envoy-api/envoy/config/core/v3/health_check.proto
+  - third_party/envoy-api/envoy/config/core/v3/http_service.proto
+  - third_party/envoy-api/envoy/config/core/v3/http_uri.proto
+  - third_party/envoy-api/envoy/config/core/v3/protocol.proto
+  - third_party/envoy-api/envoy/config/core/v3/proxy_protocol.proto
+  - third_party/envoy-api/envoy/config/core/v3/resolver.proto
+  - third_party/envoy-api/envoy/config/core/v3/socket_option.proto
+  - third_party/envoy-api/envoy/config/core/v3/substitution_format_string.proto
+  - third_party/envoy-api/envoy/config/core/v3/udp_socket_config.proto
+  - third_party/envoy-api/envoy/service/discovery/v3/ads.proto
+  - third_party/envoy-api/envoy/service/discovery/v3/discovery.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/filter_state.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/http_inputs.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/metadata.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/node.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/number.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/path.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/regex.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/status_code_input.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/string.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/struct.proto
+  - third_party/envoy-api/envoy/type/matcher/v3/value.proto
+  - third_party/envoy-api/envoy/type/v3/hash_policy.proto
+  - third_party/envoy-api/envoy/type/v3/http.proto
+  - third_party/envoy-api/envoy/type/v3/http_status.proto
+  - third_party/envoy-api/envoy/type/v3/percent.proto
+  - third_party/envoy-api/envoy/type/v3/range.proto
+  - third_party/envoy-api/envoy/type/v3/ratelimit_strategy.proto
+  - third_party/envoy-api/envoy/type/v3/ratelimit_unit.proto
+  - third_party/envoy-api/envoy/type/v3/semantic_version.proto
+  - third_party/envoy-api/envoy/type/v3/token_bucket.proto
+  - third_party/googleapis/google/api/annotations.proto
+  - third_party/googleapis/google/api/http.proto
+  - third_party/googleapis/google/api/httpbody.proto
+  - third_party/googleapis/google/rpc/status.proto
+  - third_party/protoc-gen-validate/validate/validate.proto
+  - third_party/xds/udpa/annotations/migrate.proto
+  - third_party/xds/udpa/annotations/security.proto
+  - third_party/xds/udpa/annotations/sensitive.proto
+  - third_party/xds/udpa/annotations/status.proto
+  - third_party/xds/udpa/annotations/versioning.proto
+  - third_party/xds/xds/annotations/v3/migrate.proto
+  - third_party/xds/xds/annotations/v3/security.proto
+  - third_party/xds/xds/annotations/v3/sensitive.proto
+  - third_party/xds/xds/annotations/v3/status.proto
+  - third_party/xds/xds/annotations/v3/versioning.proto
+  - third_party/xds/xds/core/v3/authority.proto
+  - third_party/xds/xds/core/v3/cidr.proto
+  - third_party/xds/xds/core/v3/collection_entry.proto
+  - third_party/xds/xds/core/v3/context_params.proto
+  - third_party/xds/xds/core/v3/extension.proto
+  - third_party/xds/xds/core/v3/resource.proto
+  - third_party/xds/xds/core/v3/resource_locator.proto
+  - third_party/xds/xds/core/v3/resource_name.proto
   - src/cpp/client/global_callback_hook.cc
   - src/cpp/util/status.cc
   - test/core/event_engine/event_engine_test_utils.cc
@@ -22906,6 +22967,12 @@ external_proto_libraries:
   urls:
   - https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz
   - https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz
+- destination: third_party/protoc-gen-validate
+  hash: 1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47
+  proto_prefix: third_party/protoc-gen-validate/
+  strip_prefix: protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69
+  urls:
+  - https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz
 - destination: third_party/xds
   hash: dc305e20c9fa80822322271b50aa2ffa917bf4fd3973bcec52bfc28dc32c5927
   proto_prefix: third_party/xds/
diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD
index 03fe7802783..4e1540a3f9f 100644
--- a/test/core/xds/BUILD
+++ b/test/core/xds/BUILD
@@ -172,8 +172,11 @@ grpc_cc_test(
     deps = [
         ":xds_client_test_peer",
         ":xds_transport_fake",
+        "//:envoy_config_core_cc_proto",
+        "//:envoy_service_discovery_cc_proto",
+        "//:grpc++_codegen_proto",
+        "//:grpc++_config_proto",
         "//:xds_client",
-        "//src/proto/grpc/testing/xds/v3:discovery_proto",
         "//test/core/event_engine:event_engine_test_utils",
         "//test/core/event_engine/fuzzing_event_engine",
         "//test/core/test_util:grpc_test_util",
diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc
index 36ddd7e47a2..a3ab4dc4576 100644
--- a/test/core/xds/xds_client_test.cc
+++ b/test/core/xds/xds_client_test.cc
@@ -40,6 +40,8 @@
 #include "absl/time/time.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
+#include "envoy/config/core/v3/base.pb.h"
+#include "envoy/service/discovery/v3/discovery.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "src/core/lib/iomgr/timer_manager.h"
@@ -53,8 +55,6 @@
 #include "src/core/util/sync.h"
 #include "src/core/xds/xds_client/xds_bootstrap.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
-#include "src/proto/grpc/testing/xds/v3/base.pb.h"
-#include "src/proto/grpc/testing/xds/v3/discovery.pb.h"
 #include "test/core/event_engine/event_engine_test_utils.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 #include "test/core/test_util/scoped_env_var.h"
diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py
index 4cfbd22a956..58ad4d17e0c 100755
--- a/tools/buildgen/extract_metadata_from_bazel_xml.py
+++ b/tools/buildgen/extract_metadata_from_bazel_xml.py
@@ -88,6 +88,10 @@ EXTERNAL_PROTO_LIBRARIES = {
     "com_github_cncf_xds": ExternalProtoLibrary(
         destination="third_party/xds", proto_prefix="third_party/xds/"
     ),
+    "com_envoyproxy_protoc_gen_validate": ExternalProtoLibrary(
+        destination="third_party/protoc-gen-validate",
+        proto_prefix="third_party/protoc-gen-validate/",
+    ),
     "opencensus_proto": ExternalProtoLibrary(
         destination="third_party/opencensus-proto/src",
         proto_prefix="third_party/opencensus-proto/src/",

From 12e95d472abc657524694900ff2dcee8f91ec6a2 Mon Sep 17 00:00:00 2001
From: Yousuk Seung <ysseung@google.com>
Date: Fri, 11 Oct 2024 10:48:58 -0700
Subject: [PATCH 61/74] [experiments] Extend work_serializer_dispatch expiry
 (#37883)

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #37883

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37883 from yousukseung:work_serializer_dispatch_extend 04c4602b736196ec78b31f118cc4e1b49a215554
PiperOrigin-RevId: 684887827
---
 src/core/lib/experiments/experiments.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index b1c7e56090b..bc8b60dfa32 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -93,7 +93,7 @@
   uses_polling: true
 - name: free_large_allocator
   description: If set, return all free bytes from a "big" allocator
-  expiry: 2024/12/01
+  expiry: 2025/03/31
   owner: alishananda@google.com
   test_tags: [resource_quota_test]
 - name: local_connector_secure
@@ -178,6 +178,6 @@
     Have the work serializer dispatch work to event engine for every callback,
     instead of running things inline in the first thread that successfully
     enqueues work.
-  expiry: 2024/09/30
+  expiry: 2024/12/31
   owner: ysseung@google.com
   test_tags: ["core_end2end_test", "cpp_end2end_test", "xds_end2end_test", "lb_unit_test"]

From 7bd6b2cf2f31b3b74dc5c1b656575b90cda28898 Mon Sep 17 00:00:00 2001
From: Yijie Ma <yijiem@google.com>
Date: Fri, 11 Oct 2024 12:13:30 -0700
Subject: [PATCH 62/74] Automated rollback of commit
 8afaf833e09b61e54b72de9db824425f7eb2adf1.

PiperOrigin-RevId: 684916586
---
 bazel/experiments.bzl                         |  5 --
 src/core/BUILD                                |  5 --
 .../transport/chttp2/server/chttp2_server.cc  | 87 +++++++------------
 src/core/lib/event_engine/resolved_address.cc |  3 -
 src/core/lib/event_engine/utils.cc            | 16 ----
 src/core/lib/event_engine/utils.h             |  7 --
 src/core/lib/experiments/experiments.cc       | 27 ------
 src/core/lib/experiments/experiments.h        |  8 --
 src/core/lib/experiments/experiments.yaml     |  8 --
 9 files changed, 30 insertions(+), 136 deletions(-)

diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index c06a4fd3ecb..f9035a02199 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -23,7 +23,6 @@ EXPERIMENT_ENABLES = {
     "event_engine_application_callbacks": "event_engine_application_callbacks",
     "event_engine_client": "event_engine_client",
     "event_engine_dns": "event_engine_dns",
-    "event_engine_dns_non_client_channel": "event_engine_dns_non_client_channel",
     "event_engine_listener": "event_engine_listener",
     "free_large_allocator": "free_large_allocator",
     "local_connector_secure": "local_connector_secure",
@@ -45,7 +44,6 @@ EXPERIMENT_ENABLES = {
 EXPERIMENT_POLLERS = [
     "event_engine_client",
     "event_engine_dns",
-    "event_engine_dns_non_client_channel",
     "event_engine_listener",
 ]
 
@@ -55,7 +53,6 @@ EXPERIMENTS = {
         },
         "off": {
             "core_end2end_test": [
-                "event_engine_dns_non_client_channel",
                 "local_connector_secure",
             ],
             "endpoint_test": [
@@ -105,7 +102,6 @@ EXPERIMENTS = {
         },
         "off": {
             "core_end2end_test": [
-                "event_engine_dns_non_client_channel",
                 "local_connector_secure",
             ],
             "endpoint_test": [
@@ -139,7 +135,6 @@ EXPERIMENTS = {
         },
         "off": {
             "core_end2end_test": [
-                "event_engine_dns_non_client_channel",
                 "local_connector_secure",
             ],
             "endpoint_test": [
diff --git a/src/core/BUILD b/src/core/BUILD
index a3e790fb9f1..5f6adbeb898 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -2371,11 +2371,9 @@ grpc_cc_library(
     hdrs = ["lib/event_engine/utils.h"],
     external_deps = [
         "absl/log:check",
-        "absl/status:statusor",
         "absl/strings",
     ],
     deps = [
-        "notification",
         "time",
         "//:event_engine_base_hdrs",
         "//:gpr_platform",
@@ -7649,11 +7647,8 @@ grpc_cc_library(
         "connection_quota",
         "error",
         "error_utils",
-        "event_engine_common",
         "event_engine_extensions",
         "event_engine_query_extensions",
-        "event_engine_tcp_socket_utils",
-        "event_engine_utils",
         "grpc_insecure_credentials",
         "handshaker_registry",
         "iomgr_fwd",
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index aae31551068..0486f7e3bf5 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -59,9 +59,6 @@
 #include "src/core/lib/event_engine/channel_args_endpoint_config.h"
 #include "src/core/lib/event_engine/extensions/supports_fd.h"
 #include "src/core/lib/event_engine/query_extensions.h"
-#include "src/core/lib/event_engine/resolved_address_internal.h"
-#include "src/core/lib/event_engine/tcp_socket_utils.h"
-#include "src/core/lib/event_engine/utils.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/event_engine_shims/endpoint.h"
@@ -116,8 +113,7 @@ using AcceptorPtr = std::unique_ptr<grpc_tcp_server_acceptor, AcceptorDeleter>;
 
 class Chttp2ServerListener : public Server::ListenerInterface {
  public:
-  static grpc_error_handle Create(Server* server,
-                                  const EventEngine::ResolvedAddress& addr,
+  static grpc_error_handle Create(Server* server, grpc_resolved_address* addr,
                                   const ChannelArgs& args,
                                   Chttp2ServerArgsModifier args_modifier,
                                   int* port_num);
@@ -705,9 +701,8 @@ void Chttp2ServerListener::ActiveConnection::OnDrainGraceTimeExpiry() {
 //
 
 grpc_error_handle Chttp2ServerListener::Create(
-    Server* server, const EventEngine::ResolvedAddress& addr,
-    const ChannelArgs& args, Chttp2ServerArgsModifier args_modifier,
-    int* port_num) {
+    Server* server, grpc_resolved_address* addr, const ChannelArgs& args,
+    Chttp2ServerArgsModifier args_modifier, int* port_num) {
   // Create Chttp2ServerListener.
   OrphanablePtr<Chttp2ServerListener> listener =
       MakeOrphanable<Chttp2ServerListener>(server, args, args_modifier,
@@ -719,24 +714,18 @@ grpc_error_handle Chttp2ServerListener::Create(
       &listener->tcp_server_shutdown_complete_, ChannelArgsEndpointConfig(args),
       OnAccept, listener.get(), &listener->tcp_server_);
   if (!error.ok()) return error;
-  // TODO(yijiem): remove this conversion when we remove all
-  // grpc_resolved_address usages.
-  grpc_resolved_address iomgr_addr =
-      grpc_event_engine::experimental::CreateGRPCResolvedAddress(addr);
   if (listener->config_fetcher_ != nullptr) {
-    listener->resolved_address_ = iomgr_addr;
+    listener->resolved_address_ = *addr;
     // TODO(yashykt): Consider binding so as to be able to return the port
     // number.
   } else {
-    error =
-        grpc_tcp_server_add_port(listener->tcp_server_, &iomgr_addr, port_num);
+    error = grpc_tcp_server_add_port(listener->tcp_server_, addr, port_num);
     if (!error.ok()) return error;
   }
   // Create channelz node.
   if (args.GetBool(GRPC_ARG_ENABLE_CHANNELZ)
           .value_or(GRPC_ENABLE_CHANNELZ_DEFAULT)) {
-    auto string_address =
-        grpc_event_engine::experimental::ResolvedAddressToString(addr);
+    auto string_address = grpc_sockaddr_to_uri(addr);
     if (!string_address.ok()) {
       return GRPC_ERROR_CREATE(string_address.status().ToString());
     }
@@ -966,53 +955,37 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr,
                                                     args_modifier);
   }
   *port_num = -1;
-  absl::StatusOr<std::vector<EventEngine::ResolvedAddress>> results =
-      std::vector<EventEngine::ResolvedAddress>();
+  absl::StatusOr<std::vector<grpc_resolved_address>> resolved_or;
   std::vector<grpc_error_handle> error_list;
   std::string parsed_addr = URI::PercentDecode(addr);
   absl::string_view parsed_addr_unprefixed{parsed_addr};
   // Using lambda to avoid use of goto.
   grpc_error_handle error = [&]() {
     grpc_error_handle error;
-    if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix) ||
-        absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixAbstractUriPrefix) ||
-        absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) {
-      absl::StatusOr<EventEngine::ResolvedAddress> result =
-          grpc_event_engine::experimental::URIToResolvedAddress(parsed_addr);
-      GRPC_RETURN_IF_ERROR(result.status());
-      results->push_back(*result);
+    if (absl::ConsumePrefix(&parsed_addr_unprefixed, kUnixUriPrefix)) {
+      resolved_or = grpc_resolve_unix_domain_address(parsed_addr_unprefixed);
+    } else if (absl::ConsumePrefix(&parsed_addr_unprefixed,
+                                   kUnixAbstractUriPrefix)) {
+      resolved_or =
+          grpc_resolve_unix_abstract_domain_address(parsed_addr_unprefixed);
+    } else if (absl::ConsumePrefix(&parsed_addr_unprefixed, kVSockUriPrefix)) {
+      resolved_or = grpc_resolve_vsock_address(parsed_addr_unprefixed);
     } else {
-      if (IsEventEngineDnsNonClientChannelEnabled()) {
-        absl::StatusOr<std::unique_ptr<EventEngine::DNSResolver>> ee_resolver =
-            args.GetObjectRef<EventEngine>()->GetDNSResolver(
-                EventEngine::DNSResolver::ResolverOptions());
-        GRPC_RETURN_IF_ERROR(ee_resolver.status());
-        results = grpc_event_engine::experimental::LookupHostnameBlocking(
-            ee_resolver->get(), parsed_addr, "https");
-      } else {
-        // TODO(yijiem): Remove this after event_engine_dns_non_client_channel
-        // is fully enabled.
-        absl::StatusOr<std::vector<grpc_resolved_address>> iomgr_results =
-            GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https");
-        GRPC_RETURN_IF_ERROR(iomgr_results.status());
-        for (const auto& addr : *iomgr_results) {
-          results->push_back(
-              grpc_event_engine::experimental::CreateResolvedAddress(addr));
-        }
-      }
+      resolved_or =
+          GetDNSResolver()->LookupHostnameBlocking(parsed_addr, "https");
+    }
+    if (!resolved_or.ok()) {
+      return absl_status_to_grpc_error(resolved_or.status());
     }
-    GRPC_RETURN_IF_ERROR(results.status());
     // Create a listener for each resolved address.
-    for (EventEngine::ResolvedAddress& addr : *results) {
+    for (auto& addr : *resolved_or) {
       // If address has a wildcard port (0), use the same port as a previous
       // listener.
-      if (*port_num != -1 &&
-          grpc_event_engine::experimental::ResolvedAddressGetPort(addr) == 0) {
-        grpc_event_engine::experimental::ResolvedAddressSetPort(addr,
-                                                                *port_num);
+      if (*port_num != -1 && grpc_sockaddr_get_port(&addr) == 0) {
+        grpc_sockaddr_set_port(&addr, *port_num);
       }
       int port_temp = -1;
-      error = Chttp2ServerListener::Create(server, addr, args, args_modifier,
+      error = Chttp2ServerListener::Create(server, &addr, args, args_modifier,
                                            &port_temp);
       if (!error.ok()) {
         error_list.push_back(error);
@@ -1024,17 +997,17 @@ grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr,
         }
       }
     }
-    if (error_list.size() == results->size()) {
+    if (error_list.size() == resolved_or->size()) {
       std::string msg = absl::StrFormat(
           "No address added out of total %" PRIuPTR " resolved for '%s'",
-          results->size(), addr);
+          resolved_or->size(), addr);
       return GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(),
                                            error_list.size());
     } else if (!error_list.empty()) {
-      std::string msg =
-          absl::StrFormat("Only %" PRIuPTR
-                          " addresses added out of total %" PRIuPTR " resolved",
-                          results->size() - error_list.size(), results->size());
+      std::string msg = absl::StrFormat(
+          "Only %" PRIuPTR " addresses added out of total %" PRIuPTR
+          " resolved",
+          resolved_or->size() - error_list.size(), resolved_or->size());
       error = GRPC_ERROR_CREATE_REFERENCING(msg.c_str(), error_list.data(),
                                             error_list.size());
       LOG(INFO) << "WARNING: " << StatusToString(error);
diff --git a/src/core/lib/event_engine/resolved_address.cc b/src/core/lib/event_engine/resolved_address.cc
index 2672923f8c2..1a41663bedd 100644
--- a/src/core/lib/event_engine/resolved_address.cc
+++ b/src/core/lib/event_engine/resolved_address.cc
@@ -48,9 +48,6 @@ EventEngine::ResolvedAddress CreateResolvedAddress(
 
 grpc_resolved_address CreateGRPCResolvedAddress(
     const EventEngine::ResolvedAddress& ra) {
-  static_assert(
-      GRPC_MAX_SOCKADDR_SIZE == EventEngine::ResolvedAddress::MAX_SIZE_BYTES,
-      "size should match");
   grpc_resolved_address grpc_addr;
   memset(&grpc_addr, 0, sizeof(grpc_resolved_address));
   memcpy(grpc_addr.addr, ra.address(), ra.size());
diff --git a/src/core/lib/event_engine/utils.cc b/src/core/lib/event_engine/utils.cc
index ad4b44a287e..f2a202315ce 100644
--- a/src/core/lib/event_engine/utils.cc
+++ b/src/core/lib/event_engine/utils.cc
@@ -20,7 +20,6 @@
 #include <algorithm>
 
 #include "absl/strings/str_cat.h"
-#include "src/core/util/notification.h"
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
@@ -39,20 +38,5 @@ grpc_core::Timestamp ToTimestamp(grpc_core::Timestamp now,
          grpc_core::Duration::Milliseconds(1);
 }
 
-absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
-LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver,
-                       absl::string_view name, absl::string_view default_port) {
-  absl::StatusOr<std::vector<EventEngine::ResolvedAddress>> results;
-  grpc_core::Notification done;
-  dns_resolver->LookupHostname(
-      [&](absl::StatusOr<std::vector<EventEngine::ResolvedAddress>> addresses) {
-        results = std::move(addresses);
-        done.Notify();
-      },
-      name, default_port);
-  done.WaitForNotification();
-  return results;
-}
-
 }  // namespace experimental
 }  // namespace grpc_event_engine
diff --git a/src/core/lib/event_engine/utils.h b/src/core/lib/event_engine/utils.h
index 0e15d69b495..45675ee8d88 100644
--- a/src/core/lib/event_engine/utils.h
+++ b/src/core/lib/event_engine/utils.h
@@ -19,10 +19,7 @@
 #include <stdint.h>
 
 #include <string>
-#include <vector>
 
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/util/time.h"
 
 namespace grpc_event_engine {
@@ -39,10 +36,6 @@ std::string HandleToString(const Handle& handle) {
 grpc_core::Timestamp ToTimestamp(grpc_core::Timestamp now,
                                  EventEngine::Duration delta);
 
-absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
-LookupHostnameBlocking(EventEngine::DNSResolver* dns_resolver,
-                       absl::string_view name, absl::string_view default_port);
-
 }  // namespace experimental
 }  // namespace grpc_event_engine
 
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index 7415fac0a9c..664498e252d 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -41,11 +41,6 @@ const char* const additional_constraints_event_engine_client = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
-const char* const description_event_engine_dns_non_client_channel =
-    "If set, use EventEngine DNSResolver in other places besides client "
-    "channel.";
-const char* const additional_constraints_event_engine_dns_non_client_channel =
-    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -123,10 +118,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_event_engine_client, nullptr, 0, false, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, false, false},
-    {"event_engine_dns_non_client_channel",
-     description_event_engine_dns_non_client_channel,
-     additional_constraints_event_engine_dns_non_client_channel, nullptr, 0,
-     false, false},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, nullptr, 0, false, true},
     {"free_large_allocator", description_free_large_allocator,
@@ -191,11 +182,6 @@ const char* const additional_constraints_event_engine_client = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
-const char* const description_event_engine_dns_non_client_channel =
-    "If set, use EventEngine DNSResolver in other places besides client "
-    "channel.";
-const char* const additional_constraints_event_engine_dns_non_client_channel =
-    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -273,10 +259,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_event_engine_client, nullptr, 0, true, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, true, false},
-    {"event_engine_dns_non_client_channel",
-     description_event_engine_dns_non_client_channel,
-     additional_constraints_event_engine_dns_non_client_channel, nullptr, 0,
-     false, false},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, nullptr, 0, true, true},
     {"free_large_allocator", description_free_large_allocator,
@@ -341,11 +323,6 @@ const char* const additional_constraints_event_engine_client = "{}";
 const char* const description_event_engine_dns =
     "If set, use EventEngine DNSResolver for client channel resolution";
 const char* const additional_constraints_event_engine_dns = "{}";
-const char* const description_event_engine_dns_non_client_channel =
-    "If set, use EventEngine DNSResolver in other places besides client "
-    "channel.";
-const char* const additional_constraints_event_engine_dns_non_client_channel =
-    "{}";
 const char* const description_event_engine_listener =
     "Use EventEngine listeners instead of iomgr's grpc_tcp_server";
 const char* const additional_constraints_event_engine_listener = "{}";
@@ -423,10 +400,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_event_engine_client, nullptr, 0, true, true},
     {"event_engine_dns", description_event_engine_dns,
      additional_constraints_event_engine_dns, nullptr, 0, true, false},
-    {"event_engine_dns_non_client_channel",
-     description_event_engine_dns_non_client_channel,
-     additional_constraints_event_engine_dns_non_client_channel, nullptr, 0,
-     false, false},
     {"event_engine_listener", description_event_engine_listener,
      additional_constraints_event_engine_listener, nullptr, 0, true, true},
     {"free_large_allocator", description_free_large_allocator,
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index 6662d016e2d..f39ff23df80 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -65,7 +65,6 @@ inline bool IsClientPrivacyEnabled() { return false; }
 inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return false; }
 inline bool IsEventEngineDnsEnabled() { return false; }
-inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 inline bool IsEventEngineListenerEnabled() { return false; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsLocalConnectorSecureEnabled() { return false; }
@@ -98,7 +97,6 @@ inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
 inline bool IsEventEngineDnsEnabled() { return true; }
-inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
@@ -132,7 +130,6 @@ inline bool IsEventEngineApplicationCallbacksEnabled() { return true; }
 inline bool IsEventEngineClientEnabled() { return true; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS
 inline bool IsEventEngineDnsEnabled() { return true; }
-inline bool IsEventEngineDnsNonClientChannelEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() { return true; }
 inline bool IsFreeLargeAllocatorEnabled() { return false; }
@@ -165,7 +162,6 @@ enum ExperimentIds {
   kExperimentIdEventEngineApplicationCallbacks,
   kExperimentIdEventEngineClient,
   kExperimentIdEventEngineDns,
-  kExperimentIdEventEngineDnsNonClientChannel,
   kExperimentIdEventEngineListener,
   kExperimentIdFreeLargeAllocator,
   kExperimentIdLocalConnectorSecure,
@@ -208,10 +204,6 @@ inline bool IsEventEngineClientEnabled() {
 inline bool IsEventEngineDnsEnabled() {
   return IsExperimentEnabled<kExperimentIdEventEngineDns>();
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_DNS_NON_CLIENT_CHANNEL
-inline bool IsEventEngineDnsNonClientChannelEnabled() {
-  return IsExperimentEnabled<kExperimentIdEventEngineDnsNonClientChannel>();
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_EVENT_ENGINE_LISTENER
 inline bool IsEventEngineListenerEnabled() {
   return IsExperimentEnabled<kExperimentIdEventEngineListener>();
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index bc8b60dfa32..85a704b1b9d 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -77,14 +77,6 @@
   test_tags: ["cancel_ares_query_test", "resolver_component_tests_runner_invoker"]
   allow_in_fuzzing_config: false
   uses_polling: true
-- name: event_engine_dns_non_client_channel
-  description:
-    If set, use EventEngine DNSResolver in other places besides client channel.
-  expiry: 2025/03/01
-  owner: yijiem@google.com
-  test_tags: ["core_end2end_test"]
-  allow_in_fuzzing_config: false
-  uses_polling: true
 - name: event_engine_listener
   description: Use EventEngine listeners instead of iomgr's grpc_tcp_server
   expiry: 2025/03/01

From 8e0e333c6c46ea458282ba8373e458a2db81f7f0 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 11 Oct 2024 14:01:05 -0700
Subject: [PATCH 63/74] [latent_see] Add a visibility control for this library
 (#37898)

We'll want to annotate some internal systems with it going forward.

Closes #37898

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37898 from ctiller:latent-vis 12e3e73c3c4a6ab2b6123706ed77da49a9d4295d
PiperOrigin-RevId: 684948162
---
 bazel/grpc_build_system.bzl | 1 +
 src/core/BUILD              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bazel/grpc_build_system.bzl b/bazel/grpc_build_system.bzl
index 92f720ff14e..fbb1be2b3c0 100644
--- a/bazel/grpc_build_system.bzl
+++ b/bazel/grpc_build_system.bzl
@@ -123,6 +123,7 @@ def _update_visibility(visibility):
         "iomgr_internal_errqueue": PRIVATE,
         "iomgr_buffer_list": PRIVATE,
         "json_reader_legacy": PRIVATE,
+        "latent_see": PRIVATE,
         "otel_plugin": PRIVATE,
         "public": PUBLIC,
         "ref_counted_ptr": PRIVATE,
diff --git a/src/core/BUILD b/src/core/BUILD
index 5f6adbeb898..dd141b44d8b 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -148,6 +148,7 @@ grpc_cc_library(
         "absl/strings",
         "absl/types:optional",
     ],
+    visibility = ["@grpc:latent_see"],
     deps = [
         "per_cpu",
         "ring_buffer",

From b7c57b91606174d44d1977a08cde9636bed161a6 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 11 Oct 2024 14:25:33 -0700
Subject: [PATCH 64/74] [call-v3] Prevent server calls from getting leaked in
 request matching (#37886)

Previously if a request was cancelled whilst being matched the matcher would leak a ref to the call forever.

Note that the only change here is `s/SpawnGuarded/SpawnGuardedUntilCallCompletes` and clang-format noise.

Closes #37886

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37886 from ctiller:flake-fightas-18 edc045102b0ec69d876b2b28d1470cbe39323e96
PiperOrigin-RevId: 684955517
---
 src/core/server/server.cc | 103 ++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 49 deletions(-)

diff --git a/src/core/server/server.cc b/src/core/server/server.cc
index 5ec784a5c96..87bb72a0dee 100644
--- a/src/core/server/server.cc
+++ b/src/core/server/server.cc
@@ -813,55 +813,60 @@ absl::StatusOr<ClientMetadataHandle> CheckClientMetadata(
 }  // namespace
 
 auto Server::MatchAndPublishCall(CallHandler call_handler) {
-  call_handler.SpawnGuarded("request_matcher", [this, call_handler]() mutable {
-    return TrySeq(
-        // Wait for initial metadata to pass through all filters
-        Map(call_handler.PullClientInitialMetadata(), CheckClientMetadata),
-        // Match request with requested call
-        [this, call_handler](ClientMetadataHandle md) mutable {
-          auto* registered_method = static_cast<RegisteredMethod*>(
-              md->get(GrpcRegisteredMethod()).value_or(nullptr));
-          RequestMatcherInterface* rm;
-          grpc_server_register_method_payload_handling payload_handling =
-              GRPC_SRM_PAYLOAD_NONE;
-          if (registered_method == nullptr) {
-            rm = unregistered_request_matcher_.get();
-          } else {
-            payload_handling = registered_method->payload_handling;
-            rm = registered_method->matcher.get();
-          }
-          auto maybe_read_first_message = If(
-              payload_handling == GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER,
-              [call_handler]() mutable { return call_handler.PullMessage(); },
-              []() -> ValueOrFailure<absl::optional<MessageHandle>> {
-                return ValueOrFailure<absl::optional<MessageHandle>>(
-                    absl::nullopt);
-              });
-          return TryJoin<absl::StatusOr>(
-              std::move(maybe_read_first_message), rm->MatchRequest(0),
-              [md = std::move(md)]() mutable {
-                return ValueOrFailure<ClientMetadataHandle>(std::move(md));
-              });
-        },
-        // Publish call to cq
-        [call_handler, this](std::tuple<absl::optional<MessageHandle>,
-                                        RequestMatcherInterface::MatchResult,
-                                        ClientMetadataHandle>
-                                 r) {
-          RequestMatcherInterface::MatchResult& mr = std::get<1>(r);
-          auto md = std::move(std::get<2>(r));
-          auto* rc = mr.TakeCall();
-          rc->Complete(std::move(std::get<0>(r)), *md);
-          grpc_call* call =
-              MakeServerCall(call_handler, std::move(md), this,
-                             rc->cq_bound_to_call, rc->initial_metadata);
-          *rc->call = call;
-          return Map(WaitForCqEndOp(false, rc->tag, absl::OkStatus(), mr.cq()),
-                     [rc = std::unique_ptr<RequestedCall>(rc)](Empty) {
-                       return absl::OkStatus();
-                     });
-        });
-  });
+  call_handler.SpawnGuardedUntilCallCompletes(
+      "request_matcher", [this, call_handler]() mutable {
+        return TrySeq(
+            // Wait for initial metadata to pass through all filters
+            Map(call_handler.PullClientInitialMetadata(), CheckClientMetadata),
+            // Match request with requested call
+            [this, call_handler](ClientMetadataHandle md) mutable {
+              auto* registered_method = static_cast<RegisteredMethod*>(
+                  md->get(GrpcRegisteredMethod()).value_or(nullptr));
+              RequestMatcherInterface* rm;
+              grpc_server_register_method_payload_handling payload_handling =
+                  GRPC_SRM_PAYLOAD_NONE;
+              if (registered_method == nullptr) {
+                rm = unregistered_request_matcher_.get();
+              } else {
+                payload_handling = registered_method->payload_handling;
+                rm = registered_method->matcher.get();
+              }
+              auto maybe_read_first_message = If(
+                  payload_handling == GRPC_SRM_PAYLOAD_READ_INITIAL_BYTE_BUFFER,
+                  [call_handler]() mutable {
+                    return call_handler.PullMessage();
+                  },
+                  []() -> ValueOrFailure<absl::optional<MessageHandle>> {
+                    return ValueOrFailure<absl::optional<MessageHandle>>(
+                        absl::nullopt);
+                  });
+              return TryJoin<absl::StatusOr>(
+                  std::move(maybe_read_first_message), rm->MatchRequest(0),
+                  [md = std::move(md)]() mutable {
+                    return ValueOrFailure<ClientMetadataHandle>(std::move(md));
+                  });
+            },
+            // Publish call to cq
+            [call_handler,
+             this](std::tuple<absl::optional<MessageHandle>,
+                              RequestMatcherInterface::MatchResult,
+                              ClientMetadataHandle>
+                       r) {
+              RequestMatcherInterface::MatchResult& mr = std::get<1>(r);
+              auto md = std::move(std::get<2>(r));
+              auto* rc = mr.TakeCall();
+              rc->Complete(std::move(std::get<0>(r)), *md);
+              grpc_call* call =
+                  MakeServerCall(call_handler, std::move(md), this,
+                                 rc->cq_bound_to_call, rc->initial_metadata);
+              *rc->call = call;
+              return Map(
+                  WaitForCqEndOp(false, rc->tag, absl::OkStatus(), mr.cq()),
+                  [rc = std::unique_ptr<RequestedCall>(rc)](Empty) {
+                    return absl::OkStatus();
+                  });
+            });
+      });
 }
 
 absl::StatusOr<RefCountedPtr<UnstartedCallDestination>>

From c7eebad1c0ecdaa8a244d0ea8c38a501920371ef Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 11 Oct 2024 14:48:22 -0700
Subject: [PATCH 65/74] Configure internal benchmark monitoring systems

PiperOrigin-RevId: 684961980
---
 test/core/transport/BUILD                          | 1 +
 test/cpp/microbenchmarks/grpc_benchmark_config.bzl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD
index c70386aedcc..068d2333265 100644
--- a/test/core/transport/BUILD
+++ b/test/core/transport/BUILD
@@ -244,6 +244,7 @@ grpc_cc_library(
 grpc_cc_benchmark(
     name = "bm_call_spine",
     srcs = ["bm_call_spine.cc"],
+    monitoring = True,
     deps = [
         ":call_spine_benchmarks",
         "//:grpc",
diff --git a/test/cpp/microbenchmarks/grpc_benchmark_config.bzl b/test/cpp/microbenchmarks/grpc_benchmark_config.bzl
index f19af0a77c0..7c9459ce4e4 100644
--- a/test/cpp/microbenchmarks/grpc_benchmark_config.bzl
+++ b/test/cpp/microbenchmarks/grpc_benchmark_config.bzl
@@ -41,6 +41,7 @@ def grpc_cc_benchmark(name, external_deps = [], tags = [], uses_polling = False,
         uses_event_engine: per grpc_cc_test, but defaulted False
         **kwargs: per grpc_cc_test
     """
+    kwargs.pop("monitoring", None)
     grpc_cc_test(
         name = name,
         args = grpc_benchmark_args(),

From 7fb7d3c3b6adcb898c238d3c2ae6a1ae5aa05db7 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 11 Oct 2024 14:55:56 -0700
Subject: [PATCH 66/74] [xDS] xDS-based HTTP CONNECT configuration (#37800)

Implements gRFC A86 (https://github.com/grpc/proposal/pull/455).

Closes #37800

PiperOrigin-RevId: 684963953
---
 BUILD                                         |  16 ++
 CMakeLists.txt                                | 192 +++++++++++++
 Makefile                                      |   3 +
 Package.swift                                 |   7 +
 build_autogenerated.yaml                      |  68 +++++
 config.m4                                     |   5 +
 config.w32                                    |   7 +
 gRPC-C++.podspec                              |   8 +
 gRPC-Core.podspec                             |  11 +
 grpc.gemspec                                  |   7 +
 package.xml                                   |   7 +
 src/core/BUILD                                |  46 ++++
 .../v3/upstream_http_11_connect.upb.h         | 106 ++++++++
 .../upstream_http_11_connect.upb_minitable.c  |  52 ++++
 .../upstream_http_11_connect.upb_minitable.h  |  32 +++
 .../v3/upstream_http_11_connect.upbdefs.c     |  53 ++++
 .../v3/upstream_http_11_connect.upbdefs.h     |  33 +++
 .../http_connect/xds_http_proxy_mapper.cc     |  57 ++++
 .../http_connect/xds_http_proxy_mapper.h      |  46 ++++
 src/core/load_balancing/xds/cds.cc            |  14 +-
 .../grpc_plugin_registry_extra.cc             |   2 +
 src/core/xds/grpc/xds_cluster.cc              |   1 +
 src/core/xds/grpc/xds_cluster.h               |   2 +
 src/core/xds/grpc/xds_cluster_parser.cc       |  90 +++++--
 src/core/xds/grpc/xds_cluster_parser.h        |   5 +
 src/core/xds/grpc/xds_common_types_parser.cc  |  38 +++
 src/core/xds/grpc/xds_common_types_parser.h   |   6 +
 src/core/xds/grpc/xds_endpoint.h              |   3 +
 src/core/xds/grpc/xds_endpoint_parser.cc      |  75 +++---
 src/core/xds/grpc/xds_metadata.h              |  24 ++
 src/core/xds/grpc/xds_metadata_parser.cc      |  52 +++-
 src/proto/grpc/testing/xds/v3/BUILD           |  10 +
 src/proto/grpc/testing/xds/v3/endpoint.proto  |  12 +
 .../xds/v3/upstream_http_11_connect.proto     |  43 +++
 src/python/grpcio/grpc_core_dependencies.py   |   3 +
 test/core/end2end/BUILD                       |   1 +
 .../end2end/fixtures/http_proxy_fixture.cc    |  20 +-
 .../end2end/fixtures/http_proxy_fixture.h     |   3 +
 test/core/xds/BUILD                           |   1 +
 .../xds/xds_cluster_resource_type_test.cc     | 252 ++++++++++++++++++
 .../xds/xds_endpoint_resource_type_test.cc    | 236 ++++++++++++++++
 test/cpp/end2end/xds/BUILD                    |  24 ++
 .../xds/xds_http_connect_end2end_test.cc      | 173 ++++++++++++
 tools/doxygen/Doxyfile.c++.internal           |   7 +
 tools/doxygen/Doxyfile.core.internal          |   7 +
 tools/run_tests/generated/tests.json          |  22 ++
 46 files changed, 1816 insertions(+), 66 deletions(-)
 create mode 100644 src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h
 create mode 100644 src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
 create mode 100644 src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h
 create mode 100644 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c
 create mode 100644 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h
 create mode 100644 src/core/handshaker/http_connect/xds_http_proxy_mapper.cc
 create mode 100644 src/core/handshaker/http_connect/xds_http_proxy_mapper.h
 create mode 100644 src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto
 create mode 100644 test/cpp/end2end/xds/xds_http_connect_end2end_test.cc

diff --git a/BUILD b/BUILD
index f5ec7efea92..6b48de532d5 100644
--- a/BUILD
+++ b/BUILD
@@ -625,6 +625,7 @@ GRPC_XDS_TARGETS = [
     "//src/core:grpc_resolver_c2p",
     "//src/core:grpc_xds_server_config_fetcher",
     "//src/core:grpc_stateful_session_filter",
+    "//src/core:xds_http_proxy_mapper",
 
     # Not xDS-specific but currently only used by xDS.
     "//src/core:channel_creds_registry_init",
@@ -4999,6 +5000,11 @@ grpc_upb_proto_library(
     deps = ["@envoy_api//envoy/config/core/v3:pkg"],
 )
 
+grpc_upb_proto_reflection_library(
+    name = "envoy_config_core_upbdefs",
+    deps = ["@envoy_api//envoy/config/core/v3:pkg"],
+)
+
 grpc_upb_proto_library(
     name = "envoy_config_endpoint_upb",
     deps = ["@envoy_api//envoy/config/endpoint/v3:pkg"],
@@ -5154,6 +5160,16 @@ grpc_upb_proto_reflection_library(
     deps = ["@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg"],
 )
 
+grpc_upb_proto_library(
+    name = "envoy_extensions_transport_sockets_http_11_proxy_upb",
+    deps = ["@envoy_api//envoy/extensions/transport_sockets/http_11_proxy/v3:pkg"],
+)
+
+grpc_upb_proto_reflection_library(
+    name = "envoy_extensions_transport_sockets_http_11_proxy_upbdefs",
+    deps = ["@envoy_api//envoy/extensions/transport_sockets/http_11_proxy/v3:pkg"],
+)
+
 grpc_upb_proto_library(
     name = "envoy_extensions_upstreams_http_upb",
     deps = ["@envoy_api//envoy/extensions/upstreams/http/v3:pkg"],
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb23c62f13e..84577907147 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -887,6 +887,9 @@ protobuf_generate_grpc_cpp_with_import_path_correction(
 protobuf_generate_grpc_cpp_with_import_path_correction(
   src/proto/grpc/testing/xds/v3/udpa_typed_struct.proto src/proto/grpc/testing/xds/v3/udpa_typed_struct.proto
 )
+protobuf_generate_grpc_cpp_with_import_path_correction(
+  src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto
+)
 protobuf_generate_grpc_cpp_with_import_path_correction(
   src/proto/grpc/testing/xds/v3/wrr_locality.proto src/proto/grpc/testing/xds/v3/wrr_locality.proto
 )
@@ -1808,6 +1811,9 @@ if(gRPC_BUILD_TESTS)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx xds_gcp_authn_end2end_test)
   endif()
+  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+    add_dependencies(buildtests_cxx xds_http_connect_end2end_test)
+  endif()
   add_dependencies(buildtests_cxx xds_http_filters_test)
   add_dependencies(buildtests_cxx xds_lb_policy_registry_test)
   add_dependencies(buildtests_cxx xds_listener_resource_type_test)
@@ -2216,6 +2222,7 @@ add_library(grpc
   src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c
   src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c
   src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c
+  src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
   src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c
   src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c
   src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c
@@ -2377,6 +2384,7 @@ add_library(grpc
   src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
   src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
   src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
+  src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c
   src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
   src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
   src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
@@ -2462,6 +2470,7 @@ add_library(grpc
   src/core/handshaker/handshaker_registry.cc
   src/core/handshaker/http_connect/http_connect_handshaker.cc
   src/core/handshaker/http_connect/http_proxy_mapper.cc
+  src/core/handshaker/http_connect/xds_http_proxy_mapper.cc
   src/core/handshaker/proxy_mapper_registry.cc
   src/core/handshaker/security/secure_endpoint.cc
   src/core/handshaker/security/security_handshaker.cc
@@ -34941,6 +34950,10 @@ add_executable(xds_cluster_resource_type_test
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/typed_struct.grpc.pb.cc
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/typed_struct.pb.h
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/typed_struct.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.grpc.pb.h
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/wrr_locality.pb.cc
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/wrr_locality.grpc.pb.cc
   ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/wrr_locality.pb.h
@@ -36518,6 +36531,185 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
   )
 
 
+endif()
+endif()
+if(gRPC_BUILD_TESTS)
+if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
+
+  add_executable(xds_http_connect_end2end_test
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/address.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/address.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/address.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/address.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/ads.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/ads.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/ads.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/ads.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/base.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/cluster.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/cluster.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/cluster.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/config_source.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/config_source.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/config_source.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/config_source.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/endpoint.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/endpoint.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/endpoint.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/endpoint.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/expr.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/expr.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/expr.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/expr.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/extension.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/extension.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/extension.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/extension.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/health_check.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/health_check.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/health_check.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/health_check.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_connection_manager.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_connection_manager.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_connection_manager.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_connection_manager.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_filter_rbac.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_filter_rbac.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_filter_rbac.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/http_filter_rbac.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/listener.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/listener.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/listener.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/listener.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/load_report.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/load_report.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/load_report.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/load_report.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/lrs.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/lrs.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/lrs.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/lrs.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/metadata.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/metadata.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/metadata.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/metadata.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/outlier_detection.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/outlier_detection.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/outlier_detection.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/outlier_detection.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/path.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/path.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/path.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/path.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/percent.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/protocol.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/protocol.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/protocol.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/protocol.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/range.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/range.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/range.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/range.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/rbac.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/rbac.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/rbac.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/rbac.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/regex.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/regex.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/regex.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/regex.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/route.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/route.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/route.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/route.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/router.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/router.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/router.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/router.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/string.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/string.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/string.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/string.grpc.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.grpc.pb.cc
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.pb.h
+    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.grpc.pb.h
+    test/core/end2end/fixtures/http_proxy_fixture.cc
+    test/cpp/end2end/test_service_impl.cc
+    test/cpp/end2end/xds/xds_end2end_test_lib.cc
+    test/cpp/end2end/xds/xds_http_connect_end2end_test.cc
+    test/cpp/end2end/xds/xds_server.cc
+    test/cpp/end2end/xds/xds_utils.cc
+    test/cpp/util/tls_test_utils.cc
+  )
+  if(WIN32 AND MSVC)
+    if(BUILD_SHARED_LIBS)
+      target_compile_definitions(xds_http_connect_end2end_test
+      PRIVATE
+        "GPR_DLL_IMPORTS"
+        "GRPC_DLL_IMPORTS"
+        "GRPCXX_DLL_IMPORTS"
+      )
+    endif()
+  endif()
+  target_compile_features(xds_http_connect_end2end_test PUBLIC cxx_std_14)
+  target_include_directories(xds_http_connect_end2end_test
+    PRIVATE
+      ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/include
+      ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+      ${_gRPC_RE2_INCLUDE_DIR}
+      ${_gRPC_SSL_INCLUDE_DIR}
+      ${_gRPC_UPB_GENERATED_DIR}
+      ${_gRPC_UPB_GRPC_GENERATED_DIR}
+      ${_gRPC_UPB_INCLUDE_DIR}
+      ${_gRPC_XXHASH_INCLUDE_DIR}
+      ${_gRPC_ZLIB_INCLUDE_DIR}
+      third_party/googletest/googletest/include
+      third_party/googletest/googletest
+      third_party/googletest/googlemock/include
+      third_party/googletest/googlemock
+      ${_gRPC_PROTO_GENS_DIR}
+  )
+
+  target_link_libraries(xds_http_connect_end2end_test
+    ${_gRPC_ALLTARGETS_LIBRARIES}
+    gtest
+    grpc++_test_util
+  )
+
+
 endif()
 endif()
 if(gRPC_BUILD_TESTS)
diff --git a/Makefile b/Makefile
index b33a29370b9..374780ac078 100644
--- a/Makefile
+++ b/Makefile
@@ -818,6 +818,7 @@ LIBGRPC_SRC = \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c \
@@ -979,6 +980,7 @@ LIBGRPC_SRC = \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
@@ -1064,6 +1066,7 @@ LIBGRPC_SRC = \
     src/core/handshaker/handshaker_registry.cc \
     src/core/handshaker/http_connect/http_connect_handshaker.cc \
     src/core/handshaker/http_connect/http_proxy_mapper.cc \
+    src/core/handshaker/http_connect/xds_http_proxy_mapper.cc \
     src/core/handshaker/proxy_mapper_registry.cc \
     src/core/handshaker/security/secure_endpoint.cc \
     src/core/handshaker/security/security_handshaker.cc \
diff --git a/Package.swift b/Package.swift
index f1e60c511ca..9194101da71 100644
--- a/Package.swift
+++ b/Package.swift
@@ -505,6 +505,9 @@ let package = Package(
         "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h",
         "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c",
         "src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c",
+        "src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h",
         "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h",
         "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c",
         "src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h",
@@ -914,6 +917,8 @@ let package = Package(
         "src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h",
         "src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c",
         "src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h",
+        "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c",
+        "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h",
         "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c",
         "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h",
         "src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c",
@@ -1085,6 +1090,8 @@ let package = Package(
         "src/core/handshaker/http_connect/http_connect_handshaker.h",
         "src/core/handshaker/http_connect/http_proxy_mapper.cc",
         "src/core/handshaker/http_connect/http_proxy_mapper.h",
+        "src/core/handshaker/http_connect/xds_http_proxy_mapper.cc",
+        "src/core/handshaker/http_connect/xds_http_proxy_mapper.h",
         "src/core/handshaker/proxy_mapper.h",
         "src/core/handshaker/proxy_mapper_registry.cc",
         "src/core/handshaker/proxy_mapper_registry.h",
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 1f4d3af67cb..e9fda988353 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -455,6 +455,8 @@ libs:
   - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h
   - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h
   - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h
   - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
   - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h
   - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h
@@ -703,6 +705,7 @@ libs:
   - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h
   - src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h
   - src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h
+  - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h
   - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h
   - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h
   - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h
@@ -789,6 +792,7 @@ libs:
   - src/core/handshaker/handshaker_registry.h
   - src/core/handshaker/http_connect/http_connect_handshaker.h
   - src/core/handshaker/http_connect/http_proxy_mapper.h
+  - src/core/handshaker/http_connect/xds_http_proxy_mapper.h
   - src/core/handshaker/proxy_mapper.h
   - src/core/handshaker/proxy_mapper_registry.h
   - src/core/handshaker/security/secure_endpoint.h
@@ -1425,6 +1429,7 @@ libs:
   - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c
   - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c
   - src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c
+  - src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
   - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c
   - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c
   - src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c
@@ -1586,6 +1591,7 @@ libs:
   - src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c
   - src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c
   - src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c
+  - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c
   - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c
   - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c
   - src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c
@@ -1671,6 +1677,7 @@ libs:
   - src/core/handshaker/handshaker_registry.cc
   - src/core/handshaker/http_connect/http_connect_handshaker.cc
   - src/core/handshaker/http_connect/http_proxy_mapper.cc
+  - src/core/handshaker/http_connect/xds_http_proxy_mapper.cc
   - src/core/handshaker/proxy_mapper_registry.cc
   - src/core/handshaker/security/secure_endpoint.cc
   - src/core/handshaker/security/security_handshaker.cc
@@ -21735,6 +21742,7 @@ targets:
   - src/proto/grpc/testing/xds/v3/string.proto
   - src/proto/grpc/testing/xds/v3/tls.proto
   - src/proto/grpc/testing/xds/v3/typed_struct.proto
+  - src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto
   - src/proto/grpc/testing/xds/v3/wrr_locality.proto
   - src/cpp/client/global_callback_hook.cc
   - src/cpp/util/status.cc
@@ -22268,6 +22276,66 @@ targets:
   - linux
   - posix
   - mac
+- name: xds_http_connect_end2end_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - test/core/end2end/fixtures/http_proxy_fixture.h
+  - test/core/test_util/scoped_env_var.h
+  - test/cpp/end2end/counted_service.h
+  - test/cpp/end2end/test_service_impl.h
+  - test/cpp/end2end/xds/xds_end2end_test_lib.h
+  - test/cpp/end2end/xds/xds_server.h
+  - test/cpp/end2end/xds/xds_utils.h
+  - test/cpp/util/tls_test_utils.h
+  src:
+  - src/proto/grpc/testing/duplicate/echo_duplicate.proto
+  - src/proto/grpc/testing/echo.proto
+  - src/proto/grpc/testing/echo_messages.proto
+  - src/proto/grpc/testing/simple_messages.proto
+  - src/proto/grpc/testing/xds/v3/address.proto
+  - src/proto/grpc/testing/xds/v3/ads.proto
+  - src/proto/grpc/testing/xds/v3/base.proto
+  - src/proto/grpc/testing/xds/v3/cluster.proto
+  - src/proto/grpc/testing/xds/v3/config_source.proto
+  - src/proto/grpc/testing/xds/v3/discovery.proto
+  - src/proto/grpc/testing/xds/v3/endpoint.proto
+  - src/proto/grpc/testing/xds/v3/expr.proto
+  - src/proto/grpc/testing/xds/v3/extension.proto
+  - src/proto/grpc/testing/xds/v3/health_check.proto
+  - src/proto/grpc/testing/xds/v3/http_connection_manager.proto
+  - src/proto/grpc/testing/xds/v3/http_filter_rbac.proto
+  - src/proto/grpc/testing/xds/v3/listener.proto
+  - src/proto/grpc/testing/xds/v3/load_report.proto
+  - src/proto/grpc/testing/xds/v3/lrs.proto
+  - src/proto/grpc/testing/xds/v3/metadata.proto
+  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
+  - src/proto/grpc/testing/xds/v3/outlier_detection.proto
+  - src/proto/grpc/testing/xds/v3/path.proto
+  - src/proto/grpc/testing/xds/v3/percent.proto
+  - src/proto/grpc/testing/xds/v3/protocol.proto
+  - src/proto/grpc/testing/xds/v3/range.proto
+  - src/proto/grpc/testing/xds/v3/rbac.proto
+  - src/proto/grpc/testing/xds/v3/regex.proto
+  - src/proto/grpc/testing/xds/v3/route.proto
+  - src/proto/grpc/testing/xds/v3/router.proto
+  - src/proto/grpc/testing/xds/v3/string.proto
+  - src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto
+  - test/core/end2end/fixtures/http_proxy_fixture.cc
+  - test/cpp/end2end/test_service_impl.cc
+  - test/cpp/end2end/xds/xds_end2end_test_lib.cc
+  - test/cpp/end2end/xds/xds_http_connect_end2end_test.cc
+  - test/cpp/end2end/xds/xds_server.cc
+  - test/cpp/end2end/xds/xds_utils.cc
+  - test/cpp/util/tls_test_utils.cc
+  deps:
+  - gtest
+  - grpc++_test_util
+  platforms:
+  - linux
+  - posix
+  - mac
 - name: xds_http_filters_test
   gtest: true
   build: test
diff --git a/config.m4 b/config.m4
index cd9212d3572..d61d5ceb2bc 100644
--- a/config.m4
+++ b/config.m4
@@ -193,6 +193,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c \
+    src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c \
     src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c \
@@ -354,6 +355,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
+    src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
     src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c \
@@ -439,6 +441,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/handshaker/handshaker_registry.cc \
     src/core/handshaker/http_connect/http_connect_handshaker.cc \
     src/core/handshaker/http_connect/http_proxy_mapper.cc \
+    src/core/handshaker/http_connect/xds_http_proxy_mapper.cc \
     src/core/handshaker/proxy_mapper_registry.cc \
     src/core/handshaker/security/secure_endpoint.cc \
     src/core/handshaker/security/security_handshaker.cc \
@@ -1459,6 +1462,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/extensions/upstreams/http/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-gen/envoy/service/discovery/v3)
@@ -1511,6 +1515,7 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/extensions/upstreams/http/v3)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upbdefs-gen/envoy/service/discovery/v3)
diff --git a/config.w32 b/config.w32
index b590018a1bd..e2fdf24e6db 100644
--- a/config.w32
+++ b/config.w32
@@ -158,6 +158,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\pick_first\\v3\\pick_first.upb_minitable.c " +
     "src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\ring_hash\\v3\\ring_hash.upb_minitable.c " +
     "src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\wrr_locality\\v3\\wrr_locality.upb_minitable.c " +
+    "src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\http_11_proxy\\v3\\upstream_http_11_connect.upb_minitable.c " +
     "src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\cert.upb_minitable.c " +
     "src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\common.upb_minitable.c " +
     "src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\secret.upb_minitable.c " +
@@ -319,6 +320,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\http\\stateful_session\\v3\\stateful_session.upbdefs.c " +
     "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\filters\\network\\http_connection_manager\\v3\\http_connection_manager.upbdefs.c " +
     "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\http\\stateful_session\\cookie\\v3\\cookie.upbdefs.c " +
+    "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\http_11_proxy\\v3\\upstream_http_11_connect.upbdefs.c " +
     "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\cert.upbdefs.c " +
     "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\common.upbdefs.c " +
     "src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\tls\\v3\\secret.upbdefs.c " +
@@ -404,6 +406,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\handshaker\\handshaker_registry.cc " +
     "src\\core\\handshaker\\http_connect\\http_connect_handshaker.cc " +
     "src\\core\\handshaker\\http_connect\\http_proxy_mapper.cc " +
+    "src\\core\\handshaker\\http_connect\\xds_http_proxy_mapper.cc " +
     "src\\core\\handshaker\\proxy_mapper_registry.cc " +
     "src\\core\\handshaker\\security\\secure_endpoint.cc " +
     "src\\core\\handshaker\\security\\security_handshaker.cc " +
@@ -1499,6 +1502,8 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\wrr_locality");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\load_balancing_policies\\wrr_locality\\v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\http_11_proxy");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\http_11_proxy\\v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\tls");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\transport_sockets\\tls\\v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-gen\\envoy\\extensions\\upstreams");
@@ -1622,6 +1627,8 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\http\\stateful_session\\cookie");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\http\\stateful_session\\cookie\\v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\http_11_proxy");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\http_11_proxy\\v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\tls");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\transport_sockets\\tls\\v3");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upbdefs-gen\\envoy\\extensions\\upstreams");
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index aeb929b9ad6..855d83c5002 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -544,6 +544,8 @@ Pod::Spec.new do |s|
                       'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h',
                       'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
                       'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h',
                       'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
                       'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h',
                       'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
@@ -792,6 +794,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
@@ -878,6 +881,7 @@ Pod::Spec.new do |s|
                       'src/core/handshaker/handshaker_registry.h',
                       'src/core/handshaker/http_connect/http_connect_handshaker.h',
                       'src/core/handshaker/http_connect/http_proxy_mapper.h',
+                      'src/core/handshaker/http_connect/xds_http_proxy_mapper.h',
                       'src/core/handshaker/proxy_mapper.h',
                       'src/core/handshaker/proxy_mapper_registry.h',
                       'src/core/handshaker/security/secure_endpoint.h',
@@ -1849,6 +1853,8 @@ Pod::Spec.new do |s|
                               'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h',
                               'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
                               'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h',
                               'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
                               'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h',
                               'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
@@ -2097,6 +2103,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
@@ -2183,6 +2190,7 @@ Pod::Spec.new do |s|
                               'src/core/handshaker/handshaker_registry.h',
                               'src/core/handshaker/http_connect/http_connect_handshaker.h',
                               'src/core/handshaker/http_connect/http_proxy_mapper.h',
+                              'src/core/handshaker/http_connect/xds_http_proxy_mapper.h',
                               'src/core/handshaker/proxy_mapper.h',
                               'src/core/handshaker/proxy_mapper_registry.h',
                               'src/core/handshaker/security/secure_endpoint.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 26ed8c8dfab..3b4c352f0ee 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -625,6 +625,9 @@ Pod::Spec.new do |s|
                       'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
                       'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c',
                       'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c',
+                      'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h',
                       'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
                       'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c',
                       'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h',
@@ -1034,6 +1037,8 @@ Pod::Spec.new do |s|
                       'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c',
                       'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c',
+                      'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
                       'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
                       'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c',
@@ -1205,6 +1210,8 @@ Pod::Spec.new do |s|
                       'src/core/handshaker/http_connect/http_connect_handshaker.h',
                       'src/core/handshaker/http_connect/http_proxy_mapper.cc',
                       'src/core/handshaker/http_connect/http_proxy_mapper.h',
+                      'src/core/handshaker/http_connect/xds_http_proxy_mapper.cc',
+                      'src/core/handshaker/http_connect/xds_http_proxy_mapper.h',
                       'src/core/handshaker/proxy_mapper.h',
                       'src/core/handshaker/proxy_mapper_registry.cc',
                       'src/core/handshaker/proxy_mapper_registry.h',
@@ -2638,6 +2645,8 @@ Pod::Spec.new do |s|
                               'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.h',
                               'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h',
                               'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h',
+                              'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h',
                               'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h',
                               'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h',
                               'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb.h',
@@ -2886,6 +2895,7 @@ Pod::Spec.new do |s|
                               'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h',
+                              'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.h',
                               'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.h',
@@ -2972,6 +2982,7 @@ Pod::Spec.new do |s|
                               'src/core/handshaker/handshaker_registry.h',
                               'src/core/handshaker/http_connect/http_connect_handshaker.h',
                               'src/core/handshaker/http_connect/http_proxy_mapper.h',
+                              'src/core/handshaker/http_connect/xds_http_proxy_mapper.h',
                               'src/core/handshaker/proxy_mapper.h',
                               'src/core/handshaker/proxy_mapper_registry.h',
                               'src/core/handshaker/security/secure_endpoint.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 349abdf9586..1206ce25b71 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -511,6 +511,9 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h )
   s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c )
   s.files += %w( src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c )
+  s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h )
   s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h )
   s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c )
   s.files += %w( src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h )
@@ -920,6 +923,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h )
   s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c )
   s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c )
+  s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h )
   s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c )
   s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h )
   s.files += %w( src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c )
@@ -1091,6 +1096,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/handshaker/http_connect/http_connect_handshaker.h )
   s.files += %w( src/core/handshaker/http_connect/http_proxy_mapper.cc )
   s.files += %w( src/core/handshaker/http_connect/http_proxy_mapper.h )
+  s.files += %w( src/core/handshaker/http_connect/xds_http_proxy_mapper.cc )
+  s.files += %w( src/core/handshaker/http_connect/xds_http_proxy_mapper.h )
   s.files += %w( src/core/handshaker/proxy_mapper.h )
   s.files += %w( src/core/handshaker/proxy_mapper_registry.cc )
   s.files += %w( src/core/handshaker/proxy_mapper_registry.h )
diff --git a/package.xml b/package.xml
index 3add46c2e40..ad87956964b 100644
--- a/package.xml
+++ b/package.xml
@@ -493,6 +493,9 @@
     <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h" role="src" />
@@ -902,6 +905,8 @@
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h" role="src" />
     <file baseinstalldir="/" name="src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c" role="src" />
@@ -1073,6 +1078,8 @@
     <file baseinstalldir="/" name="src/core/handshaker/http_connect/http_connect_handshaker.h" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/http_connect/http_proxy_mapper.cc" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/http_connect/http_proxy_mapper.h" role="src" />
+    <file baseinstalldir="/" name="src/core/handshaker/http_connect/xds_http_proxy_mapper.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/handshaker/http_connect/xds_http_proxy_mapper.h" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/proxy_mapper.h" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/proxy_mapper_registry.cc" role="src" />
     <file baseinstalldir="/" name="src/core/handshaker/proxy_mapper_registry.h" role="src" />
diff --git a/src/core/BUILD b/src/core/BUILD
index dd141b44d8b..72068744980 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -3769,6 +3769,33 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "xds_http_proxy_mapper",
+    srcs = [
+        "handshaker/http_connect/xds_http_proxy_mapper.cc",
+    ],
+    hdrs = [
+        "handshaker/http_connect/xds_http_proxy_mapper.h",
+    ],
+    external_deps = [
+        "absl/log:log",
+        "absl/strings",
+        "absl/types:optional",
+    ],
+    language = "c++",
+    deps = [
+        "channel_args",
+        "proxy_mapper",
+        "resolved_address",
+        "xds_endpoint",
+        "//:config",
+        "//:grpc_base",
+        "//:http_connect_handshaker",
+        "//:parse_address",
+        "//:sockaddr_utils",
+    ],
+)
+
 grpc_cc_library(
     name = "grpc_server_config_selector",
     hdrs = [
@@ -5788,11 +5815,13 @@ grpc_cc_library(
         "closure",
         "connectivity_state",
         "default_event_engine",
+        "down_cast",
         "env",
         "envoy_admin_upb",
         "envoy_config_cluster_upb",
         "envoy_config_cluster_upbdefs",
         "envoy_config_core_upb",
+        "envoy_config_core_upbdefs",
         "envoy_config_endpoint_upb",
         "envoy_config_endpoint_upbdefs",
         "envoy_config_listener_upb",
@@ -5821,6 +5850,8 @@ grpc_cc_library(
         "envoy_extensions_load_balancing_policies_pick_first_upb",
         "envoy_extensions_load_balancing_policies_ring_hash_upb",
         "envoy_extensions_load_balancing_policies_wrr_locality_upb",
+        "envoy_extensions_transport_sockets_http_11_proxy_upb",
+        "envoy_extensions_transport_sockets_http_11_proxy_upbdefs",
         "envoy_extensions_transport_sockets_tls_upb",
         "envoy_extensions_transport_sockets_tls_upbdefs",
         "envoy_extensions_upstreams_http_upb",
@@ -8592,6 +8623,11 @@ grpc_upb_proto_library(
     deps = ["@envoy_api//envoy/config/core/v3:pkg"],
 )
 
+grpc_upb_proto_reflection_library(
+    name = "envoy_config_core_upbdefs",
+    deps = ["@envoy_api//envoy/config/core/v3:pkg"],
+)
+
 grpc_upb_proto_library(
     name = "envoy_config_endpoint_upb",
     deps = ["@envoy_api//envoy/config/endpoint/v3:pkg"],
@@ -8753,6 +8789,16 @@ grpc_upb_proto_reflection_library(
     deps = ["@envoy_api//envoy/extensions/transport_sockets/tls/v3:pkg"],
 )
 
+grpc_upb_proto_library(
+    name = "envoy_extensions_transport_sockets_http_11_proxy_upb",
+    deps = ["@envoy_api//envoy/extensions/transport_sockets/http_11_proxy/v3:pkg"],
+)
+
+grpc_upb_proto_reflection_library(
+    name = "envoy_extensions_transport_sockets_http_11_proxy_upbdefs",
+    deps = ["@envoy_api//envoy/extensions/transport_sockets/http_11_proxy/v3:pkg"],
+)
+
 grpc_upb_proto_library(
     name = "envoy_extensions_upstreams_http_upb",
     deps = ["@envoy_api//envoy/extensions/upstreams/http/v3:pkg"],
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h
new file mode 100644
index 00000000000..7e07f5b8e5c
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h
@@ -0,0 +1,106 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H_
+
+#include "upb/generated_code_support.h"
+
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h"
+
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport { upb_Message UPB_PRIVATE(base); } envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport;
+struct envoy_config_core_v3_TransportSocket;
+
+
+
+/* envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport */
+
+UPB_INLINE envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_new(upb_Arena* arena) {
+  return (envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport*)_upb_Message_New(&envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, arena);
+}
+UPB_INLINE envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_parse(const char* buf, size_t size, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* ret = envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, NULL, 0, arena) !=
+      kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_parse_ex(const char* buf, size_t size,
+                           const upb_ExtensionRegistry* extreg,
+                           int options, upb_Arena* arena) {
+  envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* ret = envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_new(arena);
+  if (!ret) return NULL;
+  if (upb_Decode(buf, size, UPB_UPCAST(ret), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, extreg, options,
+                 arena) != kUpb_DecodeStatus_Ok) {
+    return NULL;
+  }
+  return ret;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_serialize(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg, upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, 0, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE char* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_serialize_ex(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg, int options,
+                                 upb_Arena* arena, size_t* len) {
+  char* ptr;
+  (void)upb_Encode(UPB_UPCAST(msg), &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init, options, arena, &ptr, len);
+  return ptr;
+}
+UPB_INLINE void envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_clear_transport_socket(envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  upb_Message_ClearBaseField(UPB_UPCAST(msg), &field);
+}
+UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_transport_socket(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg) {
+  const struct envoy_config_core_v3_TransportSocket* default_val = NULL;
+  const struct envoy_config_core_v3_TransportSocket* ret;
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init);
+  _upb_Message_GetNonExtensionField(UPB_UPCAST(msg), &field,
+                                    &default_val, &ret);
+  return ret;
+}
+UPB_INLINE bool envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_has_transport_socket(const envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  return upb_Message_HasBaseField(UPB_UPCAST(msg), &field);
+}
+
+UPB_INLINE void envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_set_transport_socket(envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport *msg, struct envoy_config_core_v3_TransportSocket* value) {
+  const upb_MiniTableField field = {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)};
+  UPB_PRIVATE(_upb_MiniTable_StrongReference)(&envoy__config__core__v3__TransportSocket_msg_init);
+  upb_Message_SetBaseField((upb_Message *)msg, &field, &value);
+}
+UPB_INLINE struct envoy_config_core_v3_TransportSocket* envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_mutable_transport_socket(envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport* msg, upb_Arena* arena) {
+  struct envoy_config_core_v3_TransportSocket* sub = (struct envoy_config_core_v3_TransportSocket*)envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_transport_socket(msg);
+  if (sub == NULL) {
+    sub = (struct envoy_config_core_v3_TransportSocket*)_upb_Message_New(&envoy__config__core__v3__TransportSocket_msg_init, arena);
+    if (sub) envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_set_transport_socket(msg, sub);
+  }
+  return sub;
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_H_ */
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
new file mode 100644
index 00000000000..b831a158a4d
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c
@@ -0,0 +1,52 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
+
+#include <stddef.h>
+#include "upb/generated_code_support.h"
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h"
+#include "envoy/config/core/v3/base.upb_minitable.h"
+#include "udpa/annotations/status.upb_minitable.h"
+#include "validate/validate.upb_minitable.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+extern const struct upb_MiniTable UPB_PRIVATE(_kUpb_MiniTable_StaticallyTreeShaken);
+static const upb_MiniTableSubInternal envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_submsgs[1] = {
+  {.UPB_PRIVATE(submsg) = &envoy__config__core__v3__TransportSocket_msg_init_ptr},
+};
+
+static const upb_MiniTableField envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__fields[1] = {
+  {1, UPB_SIZE(12, 16), 64, 0, 11, (int)kUpb_FieldMode_Scalar | ((int)UPB_SIZE(kUpb_FieldRep_4Byte, kUpb_FieldRep_8Byte) << kUpb_FieldRep_Shift)},
+};
+
+const upb_MiniTable envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init = {
+  &envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_submsgs[0],
+  &envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport__fields[0],
+  UPB_SIZE(16, 24), 1, kUpb_ExtMode_NonExtendable, 1, UPB_FASTTABLE_MASK(255), 0,
+#ifdef UPB_TRACING_ENABLED
+  "envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport",
+#endif
+};
+
+const upb_MiniTable* envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init_ptr = &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init;
+static const upb_MiniTable *messages_layout[1] = {
+  &envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init,
+};
+
+const upb_MiniTableFile envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upb_file_layout = {
+  messages_layout,
+  NULL,
+  NULL,
+  1,
+  0,
+  0,
+};
+
+#include "upb/port/undef.inc"
+
diff --git a/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h
new file mode 100644
index 00000000000..5bf5df70881
--- /dev/null
+++ b/src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h
@@ -0,0 +1,32 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_MINITABLE_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_MINITABLE_H_
+
+#include "upb/generated_code_support.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const upb_MiniTable envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init;
+extern const upb_MiniTable* envoy__extensions__transport_0sockets__http_011_0proxy__v3__Http11ProxyUpstreamTransport_msg_init_ptr;
+
+extern const upb_MiniTableFile envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upb_file_layout;
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPB_MINITABLE_H_ */
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c
new file mode 100644
index 00000000000..df2a69438c0
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c
@@ -0,0 +1,53 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
+
+#include "upb/reflection/def.h"
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h"
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h"
+
+extern _upb_DefPool_Init envoy_config_core_v3_base_proto_upbdefinit;
+extern _upb_DefPool_Init udpa_annotations_status_proto_upbdefinit;
+extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
+static const char descriptor[574] = {'\n', 'R', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 
+'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 'h', 't', 't', 'p', '_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', 
+'/', 'v', '3', '/', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 't', 't', 'p', '_', '1', '1', '_', 'c', 'o', 'n', 'n', 
+'e', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '3', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 
+'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 'h', 't', 't', 'p', 
+'_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 
+'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 
+'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 
+'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 
+'o', '\"', 'z', '\n', '\034', 'H', 't', 't', 'p', '1', '1', 'P', 'r', 'o', 'x', 'y', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 
+'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '\022', 'Z', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 
+'k', 'e', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 
+'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'B', '\010', 
+'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 
+'B', '\325', '\001', '\n', 'A', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 
+'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 
+'e', 't', 's', '.', 'h', 't', 't', 'p', '_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', '.', 'v', '3', 'B', '\032', 'U', 'p', 's', 
+'t', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', '1', '1', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 
+'Z', 'j', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'g', 
+'o', '-', 'c', 'o', 'n', 't', 'r', 'o', 'l', '-', 'p', 'l', 'a', 'n', 'e', '/', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 
+'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', 
+'/', 'h', 't', 't', 'p', '_', '1', '1', '_', 'p', 'r', 'o', 'x', 'y', '/', 'v', '3', ';', 'h', 't', 't', 'p', '_', '1', '1', 
+'_', 'p', 'r', 'o', 'x', 'y', 'v', '3', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[4] = {
+  &envoy_config_core_v3_base_proto_upbdefinit,
+  &udpa_annotations_status_proto_upbdefinit,
+  &validate_validate_proto_upbdefinit,
+  NULL
+};
+
+_upb_DefPool_Init envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upbdefinit = {
+  deps,
+  &envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upb_file_layout,
+  "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 574)
+};
diff --git a/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h
new file mode 100644
index 00000000000..f439037c509
--- /dev/null
+++ b/src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h
@@ -0,0 +1,33 @@
+/* This file was generated by upb_generator from the input file:
+ *
+ *     envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated.
+ * NO CHECKED-IN PROTOBUF GENCODE */
+
+#ifndef ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPBDEFS_H_
+#define ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPBDEFS_H_
+
+#include "upb/reflection/def.h"
+#include "upb/reflection/internal/def_pool.h"
+
+#include "upb/port/def.inc" // Must be last.
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern _upb_DefPool_Init envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &envoy_extensions_transport_sockets_http_11_proxy_v3_upstream_http_11_connect_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif  /* ENVOY_EXTENSIONS_TRANSPORT_SOCKETS_HTTP_11_PROXY_V3_UPSTREAM_HTTP_11_CONNECT_PROTO_UPBDEFS_H_ */
diff --git a/src/core/handshaker/http_connect/xds_http_proxy_mapper.cc b/src/core/handshaker/http_connect/xds_http_proxy_mapper.cc
new file mode 100644
index 00000000000..87627112252
--- /dev/null
+++ b/src/core/handshaker/http_connect/xds_http_proxy_mapper.cc
@@ -0,0 +1,57 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "src/core/handshaker/http_connect/xds_http_proxy_mapper.h"
+
+#include <memory>
+#include <string>
+
+#include "absl/log/log.h"
+#include "absl/types/optional.h"
+#include "src/core/handshaker/http_connect/http_connect_handshaker.h"
+#include "src/core/lib/address_utils/parse_address.h"
+#include "src/core/lib/address_utils/sockaddr_utils.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/xds/grpc/xds_endpoint.h"
+
+namespace grpc_core {
+
+absl::optional<grpc_resolved_address> XdsHttpProxyMapper::MapAddress(
+    const grpc_resolved_address& endpoint_address, ChannelArgs* args) {
+  auto proxy_address_str = args->GetString(GRPC_ARG_XDS_HTTP_PROXY);
+  if (!proxy_address_str.has_value()) return absl::nullopt;
+  auto proxy_address = StringToSockaddr(*proxy_address_str);
+  if (!proxy_address.ok()) {
+    LOG(ERROR) << "error parsing address \"" << *proxy_address_str
+               << "\": " << proxy_address.status();
+    return absl::nullopt;
+  }
+  auto endpoint_address_str = grpc_sockaddr_to_string(&endpoint_address, true);
+  if (!endpoint_address_str.ok()) {
+    LOG(ERROR) << "error converting address to string: "
+               << endpoint_address_str.status();
+    return absl::nullopt;
+  }
+  *args = args->Set(GRPC_ARG_HTTP_CONNECT_SERVER, *endpoint_address_str);
+  return *proxy_address;
+}
+
+void RegisterXdsHttpProxyMapper(CoreConfiguration::Builder* builder) {
+  builder->proxy_mapper_registry()->Register(
+      /*at_start=*/true, std::make_unique<XdsHttpProxyMapper>());
+}
+
+}  // namespace grpc_core
diff --git a/src/core/handshaker/http_connect/xds_http_proxy_mapper.h b/src/core/handshaker/http_connect/xds_http_proxy_mapper.h
new file mode 100644
index 00000000000..176c6afb5fc
--- /dev/null
+++ b/src/core/handshaker/http_connect/xds_http_proxy_mapper.h
@@ -0,0 +1,46 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H
+#define GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H
+
+#include <string>
+
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "src/core/handshaker/proxy_mapper.h"
+#include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/iomgr/resolved_address.h"
+
+namespace grpc_core {
+
+class XdsHttpProxyMapper final : public ProxyMapperInterface {
+ public:
+  absl::optional<std::string> MapName(absl::string_view /*server_uri*/,
+                                      ChannelArgs* /*args*/) override {
+    return absl::nullopt;
+  }
+
+  absl::optional<grpc_resolved_address> MapAddress(
+      const grpc_resolved_address& address, ChannelArgs* args) override;
+};
+
+void RegisterXdsHttpProxyMapper(CoreConfiguration::Builder* builder);
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_HANDSHAKER_HTTP_CONNECT_XDS_HTTP_PROXY_MAPPER_H
diff --git a/src/core/load_balancing/xds/cds.cc b/src/core/load_balancing/xds/cds.cc
index 358d9c41194..71f2dbd06ae 100644
--- a/src/core/load_balancing/xds/cds.cc
+++ b/src/core/load_balancing/xds/cds.cc
@@ -225,10 +225,11 @@ std::string MakeChildPolicyName(absl::string_view cluster,
 class PriorityEndpointIterator final : public EndpointAddressesIterator {
  public:
   PriorityEndpointIterator(
-      std::string cluster_name,
+      std::string cluster_name, bool use_http_connect,
       std::shared_ptr<const XdsEndpointResource> endpoints,
       std::vector<size_t /*child_number*/> priority_child_numbers)
       : cluster_name_(std::move(cluster_name)),
+        use_http_connect_(use_http_connect),
         endpoints_(std::move(endpoints)),
         priority_child_numbers_(std::move(priority_child_numbers)) {}
 
@@ -251,13 +252,14 @@ class PriorityEndpointIterator final : public EndpointAddressesIterator {
           uint32_t endpoint_weight =
               locality.lb_weight *
               endpoint.args().GetInt(GRPC_ARG_ADDRESS_WEIGHT).value_or(1);
-          callback(EndpointAddresses(
-              endpoint.addresses(),
+          ChannelArgs args =
               endpoint.args()
                   .SetObject(hierarchical_path_attr)
                   .Set(GRPC_ARG_ADDRESS_WEIGHT, endpoint_weight)
                   .SetObject(locality_name->Ref())
-                  .Set(GRPC_ARG_XDS_LOCALITY_WEIGHT, locality.lb_weight)));
+                  .Set(GRPC_ARG_XDS_LOCALITY_WEIGHT, locality.lb_weight);
+          if (!use_http_connect_) args = args.Remove(GRPC_ARG_XDS_HTTP_PROXY);
+          callback(EndpointAddresses(endpoint.addresses(), args));
         }
       }
     }
@@ -265,6 +267,7 @@ class PriorityEndpointIterator final : public EndpointAddressesIterator {
 
  private:
   std::string cluster_name_;
+  bool use_http_connect_;
   std::shared_ptr<const XdsEndpointResource> endpoints_;
   std::vector<size_t /*child_number*/> priority_child_numbers_;
 };
@@ -393,7 +396,8 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
             old_cluster_config, *new_cluster_config, endpoint_config);
         // Populate addresses and resolution_note for child policy.
         update_args.addresses = std::make_shared<PriorityEndpointIterator>(
-            cluster_name_, endpoint_config.endpoints,
+            cluster_name_, new_cluster_config->cluster->use_http_connect,
+            endpoint_config.endpoints,
             child_name_state_.priority_child_numbers);
         update_args.resolution_note = endpoint_config.resolution_note;
         // Construct child policy config.
diff --git a/src/core/plugin_registry/grpc_plugin_registry_extra.cc b/src/core/plugin_registry/grpc_plugin_registry_extra.cc
index 5b9dde4cf1e..555503ddedd 100644
--- a/src/core/plugin_registry/grpc_plugin_registry_extra.cc
+++ b/src/core/plugin_registry/grpc_plugin_registry_extra.cc
@@ -40,6 +40,7 @@ extern void RegisterXdsWrrLocalityLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterRingHashLbPolicy(CoreConfiguration::Builder* builder);
 extern void RegisterFileWatcherCertificateProvider(
     CoreConfiguration::Builder* builder);
+extern void RegisterXdsHttpProxyMapper(CoreConfiguration::Builder* builder);
 #endif
 void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   // Use builder to avoid unused-parameter warning.
@@ -61,6 +62,7 @@ void RegisterExtraFilters(CoreConfiguration::Builder* builder) {
   RegisterXdsWrrLocalityLbPolicy(builder);
   RegisterRingHashLbPolicy(builder);
   RegisterFileWatcherCertificateProvider(builder);
+  RegisterXdsHttpProxyMapper(builder);
 #endif
 }
 }  // namespace grpc_core
diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc
index b7633fa8fc7..6a3e5c8bbf7 100644
--- a/src/core/xds/grpc/xds_cluster.cc
+++ b/src/core/xds/grpc/xds_cluster.cc
@@ -57,6 +57,7 @@ std::string XdsClusterResource::ToString() const {
         absl::StrCat("lrs_backend_metric_propagation=",
                      lrs_backend_metric_propagation->AsString()));
   }
+  if (use_http_connect) contents.push_back("use_http_connect=true");
   if (!common_tls_context.Empty()) {
     contents.push_back(
         absl::StrCat("common_tls_context=", common_tls_context.ToString()));
diff --git a/src/core/xds/grpc/xds_cluster.h b/src/core/xds/grpc/xds_cluster.h
index a2c6982acb1..c7a0c0b02b4 100644
--- a/src/core/xds/grpc/xds_cluster.h
+++ b/src/core/xds/grpc/xds_cluster.h
@@ -94,6 +94,8 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
   // The set of metrics to propagate from ORCA to LRS.
   RefCountedPtr<const BackendMetricPropagation> lrs_backend_metric_propagation;
 
+  bool use_http_connect = false;
+
   // Tls Context used by clients
   CommonTlsContext common_tls_context;
 
diff --git a/src/core/xds/grpc/xds_cluster_parser.cc b/src/core/xds/grpc/xds_cluster_parser.cc
index 5d1ff0540e6..b8ed06f80f8 100644
--- a/src/core/xds/grpc/xds_cluster_parser.cc
+++ b/src/core/xds/grpc/xds_cluster_parser.cc
@@ -38,6 +38,7 @@
 #include "envoy/config/endpoint/v3/endpoint.upb.h"
 #include "envoy/config/endpoint/v3/endpoint_components.upb.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h"
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
 #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upb.h"
 #include "google/protobuf/any.upb.h"
@@ -47,6 +48,7 @@
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/util/env.h"
 #include "src/core/util/host_port.h"
 #include "src/core/util/time.h"
 #include "src/core/util/upb_utils.h"
@@ -63,25 +65,29 @@
 
 namespace grpc_core {
 
+// TODO(roth): Remove this once the feature passes interop tests.
+bool XdsHttpConnectEnabled() {
+  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  if (!value.has_value()) return false;
+  bool parsed_value;
+  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
+  return parse_succeeded && parsed_value;
+}
+
 namespace {
 
+constexpr absl::string_view kUpstreamTlsContextType =
+    "envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext";
+
+constexpr absl::string_view kHttp11ProxyType =
+    "envoy.extensions.transport_sockets.http_11_proxy.v3"
+    ".Http11ProxyUpstreamTransport";
+
 CommonTlsContext UpstreamTlsContextParse(
     const XdsResourceType::DecodeContext& context,
-    const envoy_config_core_v3_TransportSocket* transport_socket,
-    ValidationErrors* errors) {
-  ValidationErrors::ScopedField field(errors, ".typed_config");
-  const auto* typed_config =
-      envoy_config_core_v3_TransportSocket_typed_config(transport_socket);
-  auto extension = ExtractXdsExtension(context, typed_config, errors);
-  if (!extension.has_value()) return {};
-  if (extension->type !=
-      "envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext") {
-    ValidationErrors::ScopedField field(errors, ".type_url");
-    errors->AddError("unsupported transport socket type");
-    return {};
-  }
-  absl::string_view* serialized_upstream_tls_context =
-      absl::get_if<absl::string_view>(&extension->value);
+    const XdsExtension& extension, ValidationErrors* errors) {
+  const absl::string_view* serialized_upstream_tls_context =
+      absl::get_if<absl::string_view>(&extension.value);
   if (serialized_upstream_tls_context == nullptr) {
     errors->AddError("can't decode UpstreamTlsContext");
     return {};
@@ -110,6 +116,39 @@ CommonTlsContext UpstreamTlsContextParse(
   return common_tls_context;
 }
 
+CommonTlsContext Http11ProxyUpstreamTransportParse(
+    const XdsResourceType::DecodeContext& context,
+    const XdsExtension& extension, ValidationErrors* errors) {
+  const absl::string_view* serialized =
+      absl::get_if<absl::string_view>(&extension.value);
+  if (serialized == nullptr) {
+    errors->AddError("can't decode Http11ProxyUpstreamTransport");
+    return {};
+  }
+  const auto* http_11_proxy =
+      envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_parse(
+          serialized->data(), serialized->size(), context.arena);
+  if (http_11_proxy == nullptr) {
+    errors->AddError("can't decode Http11ProxyUpstreamTransport");
+    return {};
+  }
+  const auto* transport_socket =
+      envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_transport_socket(
+          http_11_proxy);
+  if (transport_socket == nullptr) return {};
+  ValidationErrors::ScopedField field(errors, ".transport_socket.typed_config");
+  const auto* typed_config =
+      envoy_config_core_v3_TransportSocket_typed_config(transport_socket);
+  auto wrapped_extension = ExtractXdsExtension(context, typed_config, errors);
+  if (!wrapped_extension.has_value()) return {};
+  if (wrapped_extension->type != kUpstreamTlsContextType) {
+    ValidationErrors::ScopedField field(errors, ".type_url");
+    errors->AddError("unsupported transport socket type");
+    return {};
+  }
+  return UpstreamTlsContextParse(context, *wrapped_extension, errors);
+}
+
 XdsClusterResource::Eds EdsConfigParse(
     const envoy_config_cluster_v3_Cluster* cluster, ValidationErrors* errors) {
   XdsClusterResource::Eds eds;
@@ -443,9 +482,24 @@ absl::StatusOr<std::shared_ptr<const XdsClusterResource>> CdsResourceParse(
   auto* transport_socket =
       envoy_config_cluster_v3_Cluster_transport_socket(cluster);
   if (transport_socket != nullptr) {
-    ValidationErrors::ScopedField field(&errors, ".transport_socket");
-    cds_update->common_tls_context =
-        UpstreamTlsContextParse(context, transport_socket, &errors);
+    ValidationErrors::ScopedField field(&errors,
+                                        ".transport_socket.typed_config");
+    const auto* typed_config =
+        envoy_config_core_v3_TransportSocket_typed_config(transport_socket);
+    auto extension = ExtractXdsExtension(context, typed_config, &errors);
+    if (extension.has_value()) {
+      if (XdsHttpConnectEnabled() && extension->type == kHttp11ProxyType) {
+        cds_update->use_http_connect = true;
+        cds_update->common_tls_context =
+            Http11ProxyUpstreamTransportParse(context, *extension, &errors);
+      } else if (extension->type == kUpstreamTlsContextType) {
+        cds_update->common_tls_context =
+            UpstreamTlsContextParse(context, *extension, &errors);
+      } else {
+        ValidationErrors::ScopedField field(&errors, ".type_url");
+        errors.AddError("unsupported transport socket type");
+      }
+    }
   }
   // Record LRS server name (if any).
   const envoy_config_core_v3_ConfigSource* lrs_server =
diff --git a/src/core/xds/grpc/xds_cluster_parser.h b/src/core/xds/grpc/xds_cluster_parser.h
index 59981e8ec2e..5ef66b5c864 100644
--- a/src/core/xds/grpc/xds_cluster_parser.h
+++ b/src/core/xds/grpc/xds_cluster_parser.h
@@ -20,6 +20,7 @@
 #include "absl/strings/string_view.h"
 #include "envoy/config/cluster/v3/cluster.upbdefs.h"
 #include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h"
+#include "envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h"
 #include "envoy/extensions/upstreams/http/v3/http_protocol_options.upbdefs.h"
 #include "src/core/xds/grpc/xds_cluster.h"
@@ -30,6 +31,8 @@
 
 namespace grpc_core {
 
+bool XdsHttpConnectEnabled();
+
 class XdsClusterResourceType
     : public XdsResourceTypeImpl<XdsClusterResourceType, XdsClusterResource> {
  public:
@@ -45,6 +48,8 @@ class XdsClusterResourceType
   void InitUpbSymtab(XdsClient*, upb_DefPool* symtab) const override {
     envoy_config_cluster_v3_Cluster_getmsgdef(symtab);
     envoy_extensions_clusters_aggregate_v3_ClusterConfig_getmsgdef(symtab);
+    envoy_extensions_transport_sockets_http_11_proxy_v3_Http11ProxyUpstreamTransport_getmsgdef(
+        symtab);
     envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_getmsgdef(
         symtab);
     envoy_extensions_upstreams_http_v3_HttpProtocolOptions_getmsgdef(symtab);
diff --git a/src/core/xds/grpc/xds_common_types_parser.cc b/src/core/xds/grpc/xds_common_types_parser.cc
index 164fecc6728..90fe939392c 100644
--- a/src/core/xds/grpc/xds_common_types_parser.cc
+++ b/src/core/xds/grpc/xds_common_types_parser.cc
@@ -30,6 +30,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
+#include "envoy/config/core/v3/address.upb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
 #include "envoy/type/matcher/v3/regex.upb.h"
@@ -38,6 +39,7 @@
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/struct.upbdefs.h"
 #include "google/protobuf/wrappers.upb.h"
+#include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/util/env.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/upb_utils.h"
@@ -69,6 +71,42 @@ Duration ParseDuration(const google_protobuf_Duration* proto_duration,
   return Duration::FromSecondsAndNanoseconds(seconds, nanos);
 }
 
+//
+// ParseXdsAddress()
+//
+
+absl::optional<grpc_resolved_address> ParseXdsAddress(
+    const envoy_config_core_v3_Address* address, ValidationErrors* errors) {
+  if (address == nullptr) {
+    errors->AddError("field not present");
+    return absl::nullopt;
+  }
+  ValidationErrors::ScopedField field(errors, ".socket_address");
+  const envoy_config_core_v3_SocketAddress* socket_address =
+      envoy_config_core_v3_Address_socket_address(address);
+  if (socket_address == nullptr) {
+    errors->AddError("field not present");
+    return absl::nullopt;
+  }
+  std::string address_str = UpbStringToStdString(
+      envoy_config_core_v3_SocketAddress_address(socket_address));
+  uint32_t port;
+  {
+    ValidationErrors::ScopedField field(errors, ".port_value");
+    port = envoy_config_core_v3_SocketAddress_port_value(socket_address);
+    if (GPR_UNLIKELY(port >> 16) != 0) {
+      errors->AddError("invalid port");
+      return absl::nullopt;
+    }
+  }
+  auto addr = StringToSockaddr(address_str, port);
+  if (!addr.ok()) {
+    errors->AddError(addr.status().message());
+    return absl::nullopt;
+  }
+  return *addr;
+}
+
 //
 // CommonTlsContextParse()
 //
diff --git a/src/core/xds/grpc/xds_common_types_parser.h b/src/core/xds/grpc/xds_common_types_parser.h
index 529e7abbd13..d4ca977ed2e 100644
--- a/src/core/xds/grpc/xds_common_types_parser.h
+++ b/src/core/xds/grpc/xds_common_types_parser.h
@@ -18,11 +18,13 @@
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_COMMON_TYPES_PARSER_H
 
 #include "absl/types/optional.h"
+#include "envoy/config/core/v3/base.upb.h"
 #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h"
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/struct.upb.h"
 #include "google/protobuf/wrappers.upb.h"
+#include "src/core/lib/iomgr/resolved_address.h"
 #include "src/core/util/time.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
@@ -51,6 +53,10 @@ inline absl::optional<uint32_t> ParseUInt32Value(
   return google_protobuf_UInt32Value_value(proto);
 }
 
+// Returns the IP address in URI form.
+absl::optional<grpc_resolved_address> ParseXdsAddress(
+    const envoy_config_core_v3_Address* address, ValidationErrors* errors);
+
 CommonTlsContext CommonTlsContextParse(
     const XdsResourceType::DecodeContext& context,
     const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext*
diff --git a/src/core/xds/grpc/xds_endpoint.h b/src/core/xds/grpc/xds_endpoint.h
index a74541d2543..99ad92da8d3 100644
--- a/src/core/xds/grpc/xds_endpoint.h
+++ b/src/core/xds/grpc/xds_endpoint.h
@@ -32,6 +32,9 @@
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"
 
+// Per-endpoint channel arg key for xDS-configured HTTP CONNECT proxy.
+#define GRPC_ARG_XDS_HTTP_PROXY "grpc.internal.xds_http_proxy"
+
 namespace grpc_core {
 
 struct XdsEndpointResource : public XdsResourceType::ResourceData {
diff --git a/src/core/xds/grpc/xds_endpoint_parser.cc b/src/core/xds/grpc/xds_endpoint_parser.cc
index 886052ae7cc..2bf1f443863 100644
--- a/src/core/xds/grpc/xds_endpoint_parser.cc
+++ b/src/core/xds/grpc/xds_endpoint_parser.cc
@@ -45,12 +45,15 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/util/down_cast.h"
 #include "src/core/util/env.h"
 #include "src/core/util/string.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/util/validation_errors.h"
+#include "src/core/xds/grpc/xds_cluster_parser.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_health_status.h"
+#include "src/core/xds/grpc/xds_metadata_parser.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "upb/text/encode.h"
 
@@ -84,41 +87,27 @@ void MaybeLogClusterLoadAssignment(
   }
 }
 
-absl::optional<grpc_resolved_address> ParseCoreAddress(
-    const envoy_config_core_v3_Address* address, ValidationErrors* errors) {
-  if (address == nullptr) {
-    errors->AddError("field not present");
-    return absl::nullopt;
-  }
-  ValidationErrors::ScopedField field(errors, ".socket_address");
-  const envoy_config_core_v3_SocketAddress* socket_address =
-      envoy_config_core_v3_Address_socket_address(address);
-  if (socket_address == nullptr) {
-    errors->AddError("field not present");
-    return absl::nullopt;
-  }
-  std::string address_str = UpbStringToStdString(
-      envoy_config_core_v3_SocketAddress_address(socket_address));
-  uint32_t port;
-  {
-    ValidationErrors::ScopedField field(errors, ".port_value");
-    port = envoy_config_core_v3_SocketAddress_port_value(socket_address);
-    if (GPR_UNLIKELY(port >> 16) != 0) {
-      errors->AddError("invalid port");
-      return absl::nullopt;
+std::string GetProxyAddressFromMetadata(
+    const XdsResourceType::DecodeContext& context,
+    const envoy_config_core_v3_Metadata* metadata, ValidationErrors* errors) {
+  if (XdsHttpConnectEnabled() && metadata != nullptr) {
+    XdsMetadataMap metadata_map =
+        ParseXdsMetadataMap(context, metadata, errors);
+    auto* proxy_address_entry =
+        metadata_map.Find("envoy.http11_proxy_transport_socket.proxy_address");
+    if (proxy_address_entry != nullptr &&
+        proxy_address_entry->type() == XdsAddressMetadataValue::Type()) {
+      return DownCast<const XdsAddressMetadataValue*>(proxy_address_entry)
+          ->address();
     }
   }
-  auto addr = StringToSockaddr(address_str, port);
-  if (!addr.ok()) {
-    errors->AddError(addr.status().message());
-    return absl::nullopt;
-  }
-  return *addr;
+  return "";
 }
 
 absl::optional<EndpointAddresses> EndpointAddressesParse(
+    const XdsResourceType::DecodeContext& context,
     const envoy_config_endpoint_v3_LbEndpoint* lb_endpoint,
-    ValidationErrors* errors) {
+    absl::string_view locality_proxy_address, ValidationErrors* errors) {
   // health_status
   const int32_t health_status =
       envoy_config_endpoint_v3_LbEndpoint_health_status(lb_endpoint);
@@ -136,6 +125,10 @@ absl::optional<EndpointAddresses> EndpointAddressesParse(
       errors->AddError("must be greater than 0");
     }
   }
+  // metadata
+  std::string proxy_address = GetProxyAddressFromMetadata(
+      context, envoy_config_endpoint_v3_LbEndpoint_metadata(lb_endpoint),
+      errors);
   // endpoint
   std::vector<grpc_resolved_address> addresses;
   absl::string_view hostname;
@@ -149,7 +142,7 @@ absl::optional<EndpointAddresses> EndpointAddressesParse(
     }
     {
       ValidationErrors::ScopedField field(errors, ".address");
-      auto address = ParseCoreAddress(
+      auto address = ParseXdsAddress(
           envoy_config_endpoint_v3_Endpoint_address(endpoint), errors);
       if (address.has_value()) addresses.push_back(*address);
     }
@@ -161,7 +154,7 @@ absl::optional<EndpointAddresses> EndpointAddressesParse(
       for (size_t i = 0; i < size; ++i) {
         ValidationErrors::ScopedField field(
             errors, absl::StrCat(".additional_addresses[", i, "].address"));
-        auto address = ParseCoreAddress(
+        auto address = ParseXdsAddress(
             envoy_config_endpoint_v3_Endpoint_AdditionalAddress_address(
                 additional_addresses[i]),
             errors);
@@ -179,6 +172,11 @@ absl::optional<EndpointAddresses> EndpointAddressesParse(
   if (!hostname.empty()) {
     args = args.Set(GRPC_ARG_ADDRESS_NAME, hostname);
   }
+  if (!proxy_address.empty()) {
+    args = args.Set(GRPC_ARG_XDS_HTTP_PROXY, proxy_address);
+  } else if (!locality_proxy_address.empty()) {
+    args = args.Set(GRPC_ARG_XDS_HTTP_PROXY, locality_proxy_address);
+  }
   return EndpointAddresses(addresses, args);
 }
 
@@ -198,6 +196,7 @@ using ResolvedAddressSet =
     std::set<grpc_resolved_address, ResolvedAddressLessThan>;
 
 absl::optional<ParsedLocality> LocalityParse(
+    const XdsResourceType::DecodeContext& context,
     const envoy_config_endpoint_v3_LocalityLbEndpoints* locality_lb_endpoints,
     ResolvedAddressSet* address_set, ValidationErrors* errors) {
   const size_t original_error_size = errors->size();
@@ -231,6 +230,12 @@ absl::optional<ParsedLocality> LocalityParse(
       UpbStringToStdString(envoy_config_core_v3_Locality_sub_zone(locality));
   parsed_locality.locality.name = MakeRefCounted<XdsLocalityName>(
       std::move(region), std::move(zone), std::move(sub_zone));
+  // metadata
+  std::string proxy_address = GetProxyAddressFromMetadata(
+      context,
+      envoy_config_endpoint_v3_LocalityLbEndpoints_metadata(
+          locality_lb_endpoints),
+      errors);
   // lb_endpoints
   size_t size;
   const envoy_config_endpoint_v3_LbEndpoint* const* lb_endpoints =
@@ -239,7 +244,8 @@ absl::optional<ParsedLocality> LocalityParse(
   for (size_t i = 0; i < size; ++i) {
     ValidationErrors::ScopedField field(errors,
                                         absl::StrCat(".lb_endpoints[", i, "]"));
-    auto endpoint = EndpointAddressesParse(lb_endpoints[i], errors);
+    auto endpoint =
+        EndpointAddressesParse(context, lb_endpoints[i], proxy_address, errors);
     if (endpoint.has_value()) {
       for (const auto& address : endpoint->addresses()) {
         bool inserted = address_set->insert(address).second;
@@ -311,7 +317,7 @@ void DropParseAndAppend(
 }
 
 absl::StatusOr<std::shared_ptr<const XdsEndpointResource>> EdsResourceParse(
-    const XdsResourceType::DecodeContext& /*context*/,
+    const XdsResourceType::DecodeContext& context,
     const envoy_config_endpoint_v3_ClusterLoadAssignment*
         cluster_load_assignment) {
   ValidationErrors errors;
@@ -326,7 +332,8 @@ absl::StatusOr<std::shared_ptr<const XdsEndpointResource>> EdsResourceParse(
             cluster_load_assignment, &locality_size);
     for (size_t i = 0; i < locality_size; ++i) {
       ValidationErrors::ScopedField field(&errors, absl::StrCat("[", i, "]"));
-      auto parsed_locality = LocalityParse(endpoints[i], &address_set, &errors);
+      auto parsed_locality =
+          LocalityParse(context, endpoints[i], &address_set, &errors);
       if (parsed_locality.has_value()) {
         CHECK_NE(parsed_locality->locality.lb_weight, 0u);
         // Make sure prorities is big enough. Note that they might not
diff --git a/src/core/xds/grpc/xds_metadata.h b/src/core/xds/grpc/xds_metadata.h
index 63e2178ffb0..3e8fa4f214b 100644
--- a/src/core/xds/grpc/xds_metadata.h
+++ b/src/core/xds/grpc/xds_metadata.h
@@ -121,6 +121,30 @@ class XdsGcpAuthnAudienceMetadataValue : public XdsMetadataValue {
   std::string url_;
 };
 
+// Concrete metadata value type for addresses.
+class XdsAddressMetadataValue : public XdsMetadataValue {
+ public:
+  explicit XdsAddressMetadataValue(std::string address)
+      : address_(std::move(address)) {}
+
+  static absl::string_view Type() { return "envoy.config.core.v3.Address"; }
+
+  absl::string_view type() const override { return Type(); }
+
+  const std::string& address() const { return address_; }
+
+  std::string ToString() const override {
+    return absl::StrCat(type(), "{address=\"", address_, "\"}");
+  }
+
+ private:
+  bool Equals(const XdsMetadataValue& other) const override {
+    return address_ == DownCast<const XdsAddressMetadataValue&>(other).address_;
+  }
+
+  std::string address_;
+};
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_METADATA_H
diff --git a/src/core/xds/grpc/xds_metadata_parser.cc b/src/core/xds/grpc/xds_metadata_parser.cc
index 1ec9e7a106a..9d24582d4bf 100644
--- a/src/core/xds/grpc/xds_metadata_parser.cc
+++ b/src/core/xds/grpc/xds_metadata_parser.cc
@@ -21,12 +21,16 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/variant.h"
+#include "envoy/config/core/v3/address.upb.h"
+#include "envoy/config/core/v3/address.upbdefs.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h"
+#include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/util/env.h"
 #include "src/core/util/string.h"
 #include "src/core/util/upb_utils.h"
 #include "src/core/util/validation_errors.h"
+#include "src/core/xds/grpc/xds_cluster_parser.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "upb/base/string_view.h"
@@ -80,6 +84,40 @@ std::unique_ptr<XdsMetadataValue> ParseGcpAuthnAudience(
   return std::make_unique<XdsGcpAuthnAudienceMetadataValue>(url);
 }
 
+std::unique_ptr<XdsMetadataValue> ParseAddress(
+    const XdsResourceType::DecodeContext& context, XdsExtension extension,
+    ValidationErrors* errors) {
+  absl::string_view* serialized_proto =
+      absl::get_if<absl::string_view>(&extension.value);
+  if (serialized_proto == nullptr) {
+    errors->AddError("could not parse address metadata");
+    return nullptr;
+  }
+  auto* proto = envoy_config_core_v3_Address_parse(
+      serialized_proto->data(), serialized_proto->size(), context.arena);
+  if (proto == nullptr) {
+    errors->AddError("could not parse address metadata");
+    return nullptr;
+  }
+  if (GRPC_TRACE_FLAG_ENABLED_OBJ(*context.tracer) && ABSL_VLOG_IS_ON(2)) {
+    const upb_MessageDef* msg_type =
+        envoy_config_core_v3_Address_getmsgdef(context.symtab);
+    char buf[10240];
+    upb_TextEncode(reinterpret_cast<const upb_Message*>(proto), msg_type,
+                   nullptr, 0, buf, sizeof(buf));
+    VLOG(2) << "[xds_client " << context.client
+            << "] cluster metadata Address: " << buf;
+  }
+  auto addr = ParseXdsAddress(proto, errors);
+  if (!addr.has_value()) return nullptr;
+  auto addr_uri = grpc_sockaddr_to_string(&*addr, /*normalize=*/false);
+  if (!addr_uri.ok()) {
+    errors->AddError(addr_uri.status().message());
+    return nullptr;
+  }
+  return std::make_unique<XdsAddressMetadataValue>(std::move(*addr_uri));
+}
+
 }  // namespace
 
 XdsMetadataMap ParseXdsMetadataMap(
@@ -104,15 +142,19 @@ XdsMetadataMap ParseXdsMetadataMap(
             typed_entry),
         errors);
     if (!extension.has_value()) continue;
-    // TODO(roth): If we ever need to support another type here, refactor
+    // TODO(roth): If we start to need a lot of types here, refactor
     // this into a separate registry.
+    std::unique_ptr<XdsMetadataValue> metadata_value;
     if (XdsGcpAuthFilterEnabled() &&
         extension->type == XdsGcpAuthnAudienceMetadataValue::Type()) {
-      auto metadata_value =
+      metadata_value =
           ParseGcpAuthnAudience(context, std::move(*extension), errors);
-      if (metadata_value != nullptr) {
-        metadata_map.Insert(key, std::move(metadata_value));
-      }
+    } else if (XdsHttpConnectEnabled() &&
+               extension->type == XdsAddressMetadataValue::Type()) {
+      metadata_value = ParseAddress(context, std::move(*extension), errors);
+    }
+    if (metadata_value != nullptr) {
+      metadata_map.Insert(key, std::move(metadata_value));
     }
   }
   // Then, try filter_metadata.
diff --git a/src/proto/grpc/testing/xds/v3/BUILD b/src/proto/grpc/testing/xds/v3/BUILD
index cc04d3d20fa..bd6f05bcc9e 100644
--- a/src/proto/grpc/testing/xds/v3/BUILD
+++ b/src/proto/grpc/testing/xds/v3/BUILD
@@ -318,6 +318,16 @@ grpc_proto_library(
     ],
 )
 
+grpc_proto_library(
+    name = "upstream_http_11_connect_proto",
+    srcs = [
+        "upstream_http_11_connect.proto",
+    ],
+    deps = [
+        "base_proto",
+    ],
+)
+
 grpc_proto_library(
     name = "config_dump_proto",
     srcs = [
diff --git a/src/proto/grpc/testing/xds/v3/endpoint.proto b/src/proto/grpc/testing/xds/v3/endpoint.proto
index 583296c3e34..3b3df2e6141 100644
--- a/src/proto/grpc/testing/xds/v3/endpoint.proto
+++ b/src/proto/grpc/testing/xds/v3/endpoint.proto
@@ -70,6 +70,15 @@ message LbEndpoint {
   // Optional health status when known and supplied by EDS server.
   core.v3.HealthStatus health_status = 2;
 
+  // The endpoint metadata specifies values that may be used by the load
+  // balancer to select endpoints in a cluster for a given request. The filter
+  // name should be specified as ``envoy.lb``. An example boolean key-value pair
+  // is ``canary``, providing the optional canary status of the upstream host.
+  // This may be matched against in a route's
+  // :ref:`RouteAction <envoy_v3_api_msg_config.route.v3.RouteAction>` metadata_match field
+  // to subset the endpoints considered in cluster load balancing.
+  core.v3.Metadata metadata = 3;
+
   // The optional load balancing weight of the upstream host; at least 1.
   // Envoy uses the load balancing weight in some of the built in load
   // balancers. The load balancing weight for an endpoint is divided by the sum
@@ -91,6 +100,9 @@ message LocalityLbEndpoints {
   // Identifies location of where the upstream hosts run.
   core.v3.Locality locality = 1;
 
+  // Metadata to provide additional information about the locality endpoints in aggregate.
+  core.v3.Metadata metadata = 9;
+
   // The group of endpoints belonging to the locality specified.
   repeated LbEndpoint lb_endpoints = 2;
 
diff --git a/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto b/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto
new file mode 100644
index 00000000000..b2b12bd300e
--- /dev/null
+++ b/src/proto/grpc/testing/xds/v3/upstream_http_11_connect.proto
@@ -0,0 +1,43 @@
+// Copyright 2024 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Local copy of Envoy xDS proto file, used for testing only.
+
+syntax = "proto3";
+
+package envoy.extensions.transport_sockets.http_11_proxy.v3;
+
+import "src/proto/grpc/testing/xds/v3/base.proto";
+
+// [#protodoc-title: Upstream HTTP/1.1 Proxy]
+// [#extension: envoy.transport_sockets.http_11_proxy]
+
+// Configuration for HTTP/1.1 proxy transport sockets.
+// This is intended for use in Envoy Mobile, though may eventually be extended
+// for upstream Envoy use.
+// If this transport socket is configured, and an intermediate filter adds the
+// stream info necessary for proxying to the stream info (as the test filter
+// does :repo:`here <test/integration/filters/header_to_proxy_filter.cc>`) then
+//
+// * Upstream connections will be directed to the specified proxy address rather
+//   than the host's address
+// * Upstream TLS connections will have a raw HTTP/1.1 CONNECT header prefaced
+//   to the payload, and 200 response stripped (if less than 200 bytes)
+// * Plaintext HTTP/1.1 connections will be sent with a fully qualified URL.
+//
+// This transport socket is not compatible with HTTP/3, plaintext HTTP/2, or raw TCP.
+message Http11ProxyUpstreamTransport {
+  // The underlying transport socket being wrapped.
+  config.core.v3.TransportSocket transport_socket = 1;
+}
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index e1bbd06531f..35b512712eb 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -167,6 +167,7 @@ CORE_SOURCE_FILES = [
     'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.upb_minitable.c',
     'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb_minitable.c',
     'src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c',
+    'src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c',
     'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c',
     'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/common.upb_minitable.c',
     'src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/secret.upb_minitable.c',
@@ -328,6 +329,7 @@ CORE_SOURCE_FILES = [
     'src/core/ext/upbdefs-gen/envoy/extensions/filters/http/stateful_session/v3/stateful_session.upbdefs.c',
     'src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c',
     'src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c',
+    'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c',
     'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c',
     'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c',
     'src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c',
@@ -413,6 +415,7 @@ CORE_SOURCE_FILES = [
     'src/core/handshaker/handshaker_registry.cc',
     'src/core/handshaker/http_connect/http_connect_handshaker.cc',
     'src/core/handshaker/http_connect/http_proxy_mapper.cc',
+    'src/core/handshaker/http_connect/xds_http_proxy_mapper.cc',
     'src/core/handshaker/proxy_mapper_registry.cc',
     'src/core/handshaker/security/secure_endpoint.cc',
     'src/core/handshaker/security/security_handshaker.cc',
diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD
index debaf2ef38c..38212926221 100644
--- a/test/core/end2end/BUILD
+++ b/test/core/end2end/BUILD
@@ -71,6 +71,7 @@ grpc_cc_library(
         "absl/strings",
     ],
     language = "C++",
+    visibility = ["//test/cpp/end2end/xds:__subpackages__"],
     deps = [
         "//:config",
         "//:exec_ctx",
diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc
index c5f77bcf27f..8220c5b9984 100644
--- a/test/core/end2end/fixtures/http_proxy_fixture.cc
+++ b/test/core/end2end/fixtures/http_proxy_fixture.cc
@@ -69,6 +69,7 @@ struct grpc_end2end_http_proxy {
   grpc_end2end_http_proxy()
       : combiner(grpc_combiner_create(
             grpc_event_engine::experimental::GetDefaultEventEngine())) {}
+  int port;
   std::string proxy_name;
   std::atomic<bool> is_shutdown{false};
   std::atomic<size_t> users{1};
@@ -78,6 +79,7 @@ struct grpc_end2end_http_proxy {
   gpr_mu* mu = nullptr;
   std::vector<grpc_pollset*> pollset;
   grpc_core::Combiner* combiner = nullptr;
+  std::atomic<size_t> num_connections{0};
 };
 
 namespace {
@@ -581,6 +583,7 @@ static void on_read_request_done_locked(void* arg, grpc_error_handle error) {
     }
   }
   // Resolve address.
+  VLOG(2) << "proxy connecting to backend: " << conn->http_request.path;
   absl::StatusOr<std::vector<grpc_resolved_address>> addresses_or =
       grpc_core::GetDNSResolver()->LookupHostnameBlocking(
           conn->http_request.path, "80");
@@ -626,6 +629,7 @@ static void on_accept(void* arg, grpc_endpoint* endpoint,
     proxy_unref(proxy);
     return;
   }
+  proxy->num_connections.fetch_add(1);
   // Instantiate proxy_connection.
   proxy_connection* conn = grpc_core::Zalloc<proxy_connection>();
   conn->client_endpoint = endpoint;
@@ -678,8 +682,8 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(
   grpc_end2end_http_proxy* proxy = new grpc_end2end_http_proxy();
   proxy_destroyed.store(false);
   // Construct proxy address.
-  const int proxy_port = grpc_pick_unused_port_or_die();
-  proxy->proxy_name = grpc_core::JoinHostPort("localhost", proxy_port);
+  proxy->port = grpc_pick_unused_port_or_die();
+  proxy->proxy_name = grpc_core::JoinHostPort("localhost", proxy->port);
   VLOG(2) << "Proxy address: " << proxy->proxy_name;
   // Create TCP server.
   auto channel_args = grpc_core::CoreConfiguration::Get()
@@ -698,11 +702,11 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(
   memset(&resolved_addr, 0, sizeof(resolved_addr));
   resolved_addr.len = sizeof(grpc_sockaddr_in);
   addr->sin_family = GRPC_AF_INET;
-  grpc_sockaddr_set_port(&resolved_addr, proxy_port);
+  grpc_sockaddr_set_port(&resolved_addr, proxy->port);
   int port;
   error = grpc_tcp_server_add_port(proxy->server, &resolved_addr, &port);
   CHECK_OK(error);
-  CHECK(port == proxy_port);
+  CHECK(port == proxy->port);
   // Start server.
   auto* pollset = static_cast<grpc_pollset*>(gpr_zalloc(grpc_pollset_size()));
   grpc_pollset_init(pollset, &proxy->mu);
@@ -738,3 +742,11 @@ const char* grpc_end2end_http_proxy_get_proxy_name(
     grpc_end2end_http_proxy* proxy) {
   return proxy->proxy_name.c_str();
 }
+
+int grpc_end2end_http_proxy_get_proxy_port(grpc_end2end_http_proxy* proxy) {
+  return proxy->port;
+}
+
+size_t grpc_end2end_http_proxy_num_connections(grpc_end2end_http_proxy* proxy) {
+  return proxy->num_connections.load();
+}
diff --git a/test/core/end2end/fixtures/http_proxy_fixture.h b/test/core/end2end/fixtures/http_proxy_fixture.h
index 3f3cae838ac..a2d62e1c858 100644
--- a/test/core/end2end/fixtures/http_proxy_fixture.h
+++ b/test/core/end2end/fixtures/http_proxy_fixture.h
@@ -40,4 +40,7 @@ void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy);
 const char* grpc_end2end_http_proxy_get_proxy_name(
     grpc_end2end_http_proxy* proxy);
 
+int grpc_end2end_http_proxy_get_proxy_port(grpc_end2end_http_proxy* proxy);
+size_t grpc_end2end_http_proxy_num_connections(grpc_end2end_http_proxy* proxy);
+
 #endif  // GRPC_TEST_CORE_END2END_FIXTURES_HTTP_PROXY_FIXTURE_H
diff --git a/test/core/xds/BUILD b/test/core/xds/BUILD
index 4e1540a3f9f..bf3bee9a753 100644
--- a/test/core/xds/BUILD
+++ b/test/core/xds/BUILD
@@ -346,6 +346,7 @@ grpc_cc_test(
         "//src/proto/grpc/testing/xds/v3:round_robin_proto",
         "//src/proto/grpc/testing/xds/v3:tls_proto",
         "//src/proto/grpc/testing/xds/v3:typed_struct_proto",
+        "//src/proto/grpc/testing/xds/v3:upstream_http_11_connect_proto",
         "//src/proto/grpc/testing/xds/v3:wrr_locality_proto",
         "//test/core/test_util:grpc_test_util",
         "//test/core/test_util:scoped_env_var",
diff --git a/test/core/xds/xds_cluster_resource_type_test.cc b/test/core/xds/xds_cluster_resource_type_test.cc
index 8be6ab83171..a856fdf78e5 100644
--- a/test/core/xds/xds_cluster_resource_type_test.cc
+++ b/test/core/xds/xds_cluster_resource_type_test.cc
@@ -61,6 +61,7 @@
 #include "src/proto/grpc/testing/xds/v3/round_robin.pb.h"
 #include "src/proto/grpc/testing/xds/v3/tls.pb.h"
 #include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h"
+#include "src/proto/grpc/testing/xds/v3/upstream_http_11_connect.pb.h"
 #include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h"
 #include "test/core/test_util/scoped_env_var.h"
 #include "test/core/test_util/test_config.h"
@@ -72,6 +73,8 @@ using envoy::extensions::clusters::aggregate::v3::ClusterConfig;
 using envoy::extensions::filters::http::gcp_authn::v3::Audience;
 using envoy::extensions::load_balancing_policies::round_robin::v3::RoundRobin;
 using envoy::extensions::load_balancing_policies::wrr_locality::v3::WrrLocality;
+using envoy::extensions::transport_sockets::http_11_proxy::v3::
+    Http11ProxyUpstreamTransport;
 using envoy::extensions::transport_sockets::tls::v3::UpstreamTlsContext;
 using envoy::extensions::upstreams::http::v3::HttpProtocolOptions;
 using xds::type::v3::TypedStruct;
@@ -1110,6 +1113,255 @@ TEST_F(TlsConfigTest, CaCertProviderUnset) {
       << decode_result.resource.status();
 }
 
+//
+// HTTP CONNECT tests
+//
+
+using HttpConnectTest = XdsClusterTest;
+
+TEST_F(HttpConnectTest, FeatureNotEnabled) {
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  auto* transport_socket = cluster.mutable_transport_socket();
+  transport_socket->set_name("envoy.transport_sockets.http_11_proxy");
+  Http11ProxyUpstreamTransport http_11_proxy;
+  transport_socket->mutable_typed_config()->PackFrom(http_11_proxy);
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  EXPECT_EQ(decode_result.resource.status().code(),
+            absl::StatusCode::kInvalidArgument);
+  EXPECT_EQ(decode_result.resource.status().message(),
+            "errors validating Cluster resource: ["
+            "field:transport_socket.typed_config.value["
+            "envoy.extensions.transport_sockets.http_11_proxy.v3"
+            ".Http11ProxyUpstreamTransport].type_url "
+            "error:unsupported transport socket type]")
+      << decode_result.resource.status();
+}
+
+TEST_F(HttpConnectTest, NoTransportSocket) {
+  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsClusterResource&>(**decode_result.resource);
+  EXPECT_FALSE(resource.use_http_connect);
+  EXPECT_TRUE(resource.common_tls_context.Empty());
+}
+
+TEST_F(HttpConnectTest, NoInnerTransportSocket) {
+  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  auto* transport_socket = cluster.mutable_transport_socket();
+  transport_socket->set_name("envoy.transport_sockets.http_11_proxy");
+  Http11ProxyUpstreamTransport http_11_proxy;
+  transport_socket->mutable_typed_config()->PackFrom(http_11_proxy);
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsClusterResource&>(**decode_result.resource);
+  EXPECT_TRUE(resource.use_http_connect);
+  EXPECT_TRUE(resource.common_tls_context.Empty());
+}
+
+TEST_F(HttpConnectTest, UnknownWrappedTransportSocketType) {
+  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  auto* transport_socket = cluster.mutable_transport_socket();
+  Http11ProxyUpstreamTransport http_11_proxy;
+  http_11_proxy.mutable_transport_socket()->mutable_typed_config()->PackFrom(
+      Cluster());
+  transport_socket->mutable_typed_config()->PackFrom(http_11_proxy);
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  EXPECT_EQ(decode_result.resource.status().code(),
+            absl::StatusCode::kInvalidArgument);
+  EXPECT_EQ(decode_result.resource.status().message(),
+            "errors validating Cluster resource: ["
+            "field:transport_socket.typed_config.value["
+            "envoy.extensions.transport_sockets.http_11_proxy.v3"
+            ".Http11ProxyUpstreamTransport]"
+            ".transport_socket.typed_config.value["
+            "envoy.config.cluster.v3.Cluster].type_url "
+            "error:unsupported transport socket type]")
+      << decode_result.resource.status();
+}
+
+TEST_F(HttpConnectTest, UnparsableHttp11ProxyUpstreamTransport) {
+  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  auto* transport_socket = cluster.mutable_transport_socket();
+  auto* typed_config = transport_socket->mutable_typed_config();
+  typed_config->PackFrom(Http11ProxyUpstreamTransport());
+  typed_config->set_value(std::string("\0", 1));
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  EXPECT_EQ(decode_result.resource.status().code(),
+            absl::StatusCode::kInvalidArgument);
+  EXPECT_EQ(decode_result.resource.status().message(),
+            "errors validating Cluster resource: ["
+            "field:transport_socket.typed_config.value["
+            "envoy.extensions.transport_sockets.http_11_proxy.v3"
+            ".Http11ProxyUpstreamTransport] "
+            "error:can't decode Http11ProxyUpstreamTransport]")
+      << decode_result.resource.status();
+}
+
+TEST_F(HttpConnectTest, UpstreamTlsContextInTypedStruct) {
+  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  auto* transport_socket = cluster.mutable_transport_socket();
+  xds::type::v3::TypedStruct typed_struct;
+  typed_struct.set_type_url(
+      "types.googleapis.com/envoy.extensions.transport_sockets.http_11_proxy"
+      ".v3.Http11ProxyUpstreamTransport");
+  transport_socket->mutable_typed_config()->PackFrom(typed_struct);
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  EXPECT_EQ(decode_result.resource.status().code(),
+            absl::StatusCode::kInvalidArgument);
+  EXPECT_EQ(decode_result.resource.status().message(),
+            "errors validating Cluster resource: ["
+            "field:transport_socket.typed_config.value["
+            "xds.type.v3.TypedStruct].value["
+            "envoy.extensions.transport_sockets.http_11_proxy.v3"
+            ".Http11ProxyUpstreamTransport] "
+            "error:can't decode Http11ProxyUpstreamTransport]")
+      << decode_result.resource.status();
+}
+
+TEST_F(HttpConnectTest, WrappingUpstreamTlsContext) {
+  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  auto* transport_socket = cluster.mutable_transport_socket();
+  transport_socket->set_name("envoy.transport_sockets.http_11_proxy");
+  UpstreamTlsContext upstream_tls_context;
+  auto* common_tls_context = upstream_tls_context.mutable_common_tls_context();
+  auto* validation_context = common_tls_context->mutable_validation_context();
+  auto* cert_provider =
+      validation_context->mutable_ca_certificate_provider_instance();
+  cert_provider->set_instance_name("provider1");
+  cert_provider->set_certificate_name("cert_name");
+  Http11ProxyUpstreamTransport http_11_proxy;
+  http_11_proxy.mutable_transport_socket()->mutable_typed_config()->PackFrom(
+      upstream_tls_context);
+  transport_socket->mutable_typed_config()->PackFrom(http_11_proxy);
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsClusterResource&>(**decode_result.resource);
+  EXPECT_TRUE(resource.use_http_connect);
+  auto* ca_cert_provider =
+      absl::get_if<CommonTlsContext::CertificateProviderPluginInstance>(
+          &resource.common_tls_context.certificate_validation_context.ca_certs);
+  ASSERT_NE(ca_cert_provider, nullptr);
+  EXPECT_EQ(ca_cert_provider->instance_name, "provider1");
+  EXPECT_EQ(ca_cert_provider->certificate_name, "cert_name");
+}
+
+// This is just one example of where CommonTlsContext::Parse() will
+// generate an error, to show that we're propagating any such errors
+// correctly.  An exhaustive set of tests for CommonTlsContext::Parse()
+// is in xds_common_types_test.cc.
+TEST_F(HttpConnectTest, WrappingInvalidUpstreamTlsContext) {
+  ScopedExperimentalEnvVar env_var("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  Cluster cluster;
+  cluster.set_name("foo");
+  cluster.set_type(cluster.EDS);
+  cluster.mutable_eds_cluster_config()->mutable_eds_config()->mutable_self();
+  auto* transport_socket = cluster.mutable_transport_socket();
+  transport_socket->set_name("envoy.transport_sockets.tls");
+  UpstreamTlsContext upstream_tls_context;
+  auto* cert_provider = upstream_tls_context.mutable_common_tls_context()
+                            ->mutable_validation_context()
+                            ->mutable_ca_certificate_provider_instance();
+  cert_provider->set_instance_name("fake");
+  cert_provider->set_certificate_name("cert_name");
+  Http11ProxyUpstreamTransport http_11_proxy;
+  http_11_proxy.mutable_transport_socket()->mutable_typed_config()->PackFrom(
+      upstream_tls_context);
+  transport_socket->mutable_typed_config()->PackFrom(http_11_proxy);
+  std::string serialized_resource;
+  ASSERT_TRUE(cluster.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsClusterResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  EXPECT_EQ(decode_result.resource.status().code(),
+            absl::StatusCode::kInvalidArgument);
+  EXPECT_EQ(decode_result.resource.status().message(),
+            "errors validating Cluster resource: ["
+            "field:transport_socket.typed_config.value["
+            "envoy.extensions.transport_sockets.http_11_proxy.v3"
+            ".Http11ProxyUpstreamTransport]"
+            ".transport_socket.typed_config.value["
+            "envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext]"
+            ".common_tls_context.validation_context"
+            ".ca_certificate_provider_instance.instance_name "
+            "error:unrecognized certificate provider instance name: fake]")
+      << decode_result.resource.status();
+}
+
 //
 // LRS tests
 //
diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc
index af6f708a558..cf36409c662 100644
--- a/test/core/xds/xds_endpoint_resource_type_test.cc
+++ b/test/core/xds/xds_endpoint_resource_type_test.cc
@@ -1251,6 +1251,242 @@ TEST_F(XdsEndpointTest, EndpointHealthStatus) {
             XdsHealthStatus::kDraining);
 }
 
+TEST_F(XdsEndpointTest, HttpProxyInEndpoint) {
+  testing::ScopedExperimentalEnvVar env("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  ClusterLoadAssignment cla;
+  cla.set_cluster_name("foo");
+  auto* locality = cla.add_endpoints();
+  locality->mutable_load_balancing_weight()->set_value(1);
+  auto* locality_name = locality->mutable_locality();
+  locality_name->set_region("myregion");
+  locality_name->set_zone("myzone");
+  locality_name->set_sub_zone("mysubzone");
+  auto* lb_endpoint = locality->add_lb_endpoints();
+  envoy::config::core::v3::Address address_proto;
+  auto* socket_address = address_proto.mutable_socket_address();
+  socket_address->set_address("1.2.3.4");
+  socket_address->set_port_value(123);
+  auto& typed_metadata_map =
+      *lb_endpoint->mutable_metadata()->mutable_typed_filter_metadata();
+  typed_metadata_map["envoy.http11_proxy_transport_socket.proxy_address"]
+      .PackFrom(address_proto);
+  socket_address = lb_endpoint->mutable_endpoint()
+                       ->mutable_address()
+                       ->mutable_socket_address();
+  socket_address->set_address("127.0.0.1");
+  socket_address->set_port_value(443);
+  std::string serialized_resource;
+  ASSERT_TRUE(cla.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsEndpointResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsEndpointResource&>(**decode_result.resource);
+  ASSERT_EQ(resource.priorities.size(), 1);
+  const auto& priority = resource.priorities[0];
+  ASSERT_EQ(priority.localities.size(), 1);
+  const auto& p = *priority.localities.begin();
+  ASSERT_EQ(p.first, p.second.name.get());
+  EXPECT_EQ(p.first->region(), "myregion");
+  EXPECT_EQ(p.first->zone(), "myzone");
+  EXPECT_EQ(p.first->sub_zone(), "mysubzone");
+  EXPECT_EQ(p.second.lb_weight, 1);
+  ASSERT_EQ(p.second.endpoints.size(), 1);
+  const auto& address = p.second.endpoints.front();
+  auto addr = grpc_sockaddr_to_string(&address.address(), /*normalize=*/false);
+  ASSERT_TRUE(addr.ok()) << addr.status();
+  EXPECT_EQ(*addr, "127.0.0.1:443");
+  EXPECT_EQ(address.args(), ChannelArgs()
+                                .Set(GRPC_ARG_ADDRESS_WEIGHT, 1)
+                                .Set(GRPC_ARG_XDS_HEALTH_STATUS,
+                                     XdsHealthStatus::HealthStatus::kUnknown)
+                                .Set(GRPC_ARG_XDS_HTTP_PROXY, "1.2.3.4:123"));
+  EXPECT_EQ(resource.drop_config, nullptr);
+}
+
+TEST_F(XdsEndpointTest, HttpProxyInLocality) {
+  testing::ScopedExperimentalEnvVar env("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  ClusterLoadAssignment cla;
+  cla.set_cluster_name("foo");
+  auto* locality = cla.add_endpoints();
+  envoy::config::core::v3::Address address_proto;
+  auto* socket_address = address_proto.mutable_socket_address();
+  socket_address->set_address("1.2.3.4");
+  socket_address->set_port_value(123);
+  auto& typed_metadata_map =
+      *locality->mutable_metadata()->mutable_typed_filter_metadata();
+  typed_metadata_map["envoy.http11_proxy_transport_socket.proxy_address"]
+      .PackFrom(address_proto);
+  locality->mutable_load_balancing_weight()->set_value(1);
+  auto* locality_name = locality->mutable_locality();
+  locality_name->set_region("myregion");
+  locality_name->set_zone("myzone");
+  locality_name->set_sub_zone("mysubzone");
+  auto* lb_endpoint = locality->add_lb_endpoints();
+  socket_address = lb_endpoint->mutable_endpoint()
+                       ->mutable_address()
+                       ->mutable_socket_address();
+  socket_address->set_address("127.0.0.1");
+  socket_address->set_port_value(443);
+  std::string serialized_resource;
+  ASSERT_TRUE(cla.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsEndpointResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsEndpointResource&>(**decode_result.resource);
+  ASSERT_EQ(resource.priorities.size(), 1);
+  const auto& priority = resource.priorities[0];
+  ASSERT_EQ(priority.localities.size(), 1);
+  const auto& p = *priority.localities.begin();
+  ASSERT_EQ(p.first, p.second.name.get());
+  EXPECT_EQ(p.first->region(), "myregion");
+  EXPECT_EQ(p.first->zone(), "myzone");
+  EXPECT_EQ(p.first->sub_zone(), "mysubzone");
+  EXPECT_EQ(p.second.lb_weight, 1);
+  ASSERT_EQ(p.second.endpoints.size(), 1);
+  const auto& address = p.second.endpoints.front();
+  auto addr = grpc_sockaddr_to_string(&address.address(), /*normalize=*/false);
+  ASSERT_TRUE(addr.ok()) << addr.status();
+  EXPECT_EQ(*addr, "127.0.0.1:443");
+  EXPECT_EQ(address.args(), ChannelArgs()
+                                .Set(GRPC_ARG_ADDRESS_WEIGHT, 1)
+                                .Set(GRPC_ARG_XDS_HEALTH_STATUS,
+                                     XdsHealthStatus::HealthStatus::kUnknown)
+                                .Set(GRPC_ARG_XDS_HTTP_PROXY, "1.2.3.4:123"));
+  EXPECT_EQ(resource.drop_config, nullptr);
+}
+
+TEST_F(XdsEndpointTest, HttpProxyEndpointSupercedesLocality) {
+  testing::ScopedExperimentalEnvVar env("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  ClusterLoadAssignment cla;
+  cla.set_cluster_name("foo");
+  auto* locality = cla.add_endpoints();
+  envoy::config::core::v3::Address address_proto;
+  auto* socket_address = address_proto.mutable_socket_address();
+  socket_address->set_address("1.2.3.4");
+  socket_address->set_port_value(123);
+  auto& typed_metadata_map =
+      *locality->mutable_metadata()->mutable_typed_filter_metadata();
+  typed_metadata_map["envoy.http11_proxy_transport_socket.proxy_address"]
+      .PackFrom(address_proto);
+  locality->mutable_load_balancing_weight()->set_value(1);
+  auto* locality_name = locality->mutable_locality();
+  locality_name->set_region("myregion");
+  locality_name->set_zone("myzone");
+  locality_name->set_sub_zone("mysubzone");
+  auto* lb_endpoint = locality->add_lb_endpoints();
+  socket_address->set_address("4.5.6.7");
+  socket_address->set_port_value(456);
+  auto& endpoint_typed_metadata_map =
+      *lb_endpoint->mutable_metadata()->mutable_typed_filter_metadata();
+  endpoint_typed_metadata_map
+      ["envoy.http11_proxy_transport_socket.proxy_address"]
+          .PackFrom(address_proto);
+  socket_address = lb_endpoint->mutable_endpoint()
+                       ->mutable_address()
+                       ->mutable_socket_address();
+  socket_address->set_address("127.0.0.1");
+  socket_address->set_port_value(443);
+  std::string serialized_resource;
+  ASSERT_TRUE(cla.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsEndpointResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsEndpointResource&>(**decode_result.resource);
+  ASSERT_EQ(resource.priorities.size(), 1);
+  const auto& priority = resource.priorities[0];
+  ASSERT_EQ(priority.localities.size(), 1);
+  const auto& p = *priority.localities.begin();
+  ASSERT_EQ(p.first, p.second.name.get());
+  EXPECT_EQ(p.first->region(), "myregion");
+  EXPECT_EQ(p.first->zone(), "myzone");
+  EXPECT_EQ(p.first->sub_zone(), "mysubzone");
+  EXPECT_EQ(p.second.lb_weight, 1);
+  ASSERT_EQ(p.second.endpoints.size(), 1);
+  const auto& address = p.second.endpoints.front();
+  auto addr = grpc_sockaddr_to_string(&address.address(), /*normalize=*/false);
+  ASSERT_TRUE(addr.ok()) << addr.status();
+  EXPECT_EQ(*addr, "127.0.0.1:443");
+  EXPECT_EQ(address.args(), ChannelArgs()
+                                .Set(GRPC_ARG_ADDRESS_WEIGHT, 1)
+                                .Set(GRPC_ARG_XDS_HEALTH_STATUS,
+                                     XdsHealthStatus::HealthStatus::kUnknown)
+                                .Set(GRPC_ARG_XDS_HTTP_PROXY, "4.5.6.7:456"));
+  EXPECT_EQ(resource.drop_config, nullptr);
+}
+
+TEST_F(XdsEndpointTest, HttpProxyIgnoredIfNotEnabled) {
+  ClusterLoadAssignment cla;
+  cla.set_cluster_name("foo");
+  auto* locality = cla.add_endpoints();
+  envoy::config::core::v3::Address address_proto;
+  auto* socket_address = address_proto.mutable_socket_address();
+  socket_address->set_address("1.2.3.4");
+  socket_address->set_port_value(123);
+  auto& typed_metadata_map =
+      *locality->mutable_metadata()->mutable_typed_filter_metadata();
+  typed_metadata_map["envoy.http11_proxy_transport_socket.proxy_address"]
+      .PackFrom(address_proto);
+  locality->mutable_load_balancing_weight()->set_value(1);
+  auto* locality_name = locality->mutable_locality();
+  locality_name->set_region("myregion");
+  locality_name->set_zone("myzone");
+  locality_name->set_sub_zone("mysubzone");
+  auto* lb_endpoint = locality->add_lb_endpoints();
+  socket_address->set_address("4.5.6.7");
+  socket_address->set_port_value(456);
+  auto& endpoint_typed_metadata_map =
+      *lb_endpoint->mutable_metadata()->mutable_typed_filter_metadata();
+  endpoint_typed_metadata_map
+      ["envoy.http11_proxy_transport_socket.proxy_address"]
+          .PackFrom(address_proto);
+  socket_address = lb_endpoint->mutable_endpoint()
+                       ->mutable_address()
+                       ->mutable_socket_address();
+  socket_address->set_address("127.0.0.1");
+  socket_address->set_port_value(443);
+  std::string serialized_resource;
+  ASSERT_TRUE(cla.SerializeToString(&serialized_resource));
+  auto* resource_type = XdsEndpointResourceType::Get();
+  auto decode_result =
+      resource_type->Decode(decode_context_, serialized_resource);
+  ASSERT_TRUE(decode_result.resource.ok()) << decode_result.resource.status();
+  ASSERT_TRUE(decode_result.name.has_value());
+  EXPECT_EQ(*decode_result.name, "foo");
+  auto& resource =
+      static_cast<const XdsEndpointResource&>(**decode_result.resource);
+  ASSERT_EQ(resource.priorities.size(), 1);
+  const auto& priority = resource.priorities[0];
+  ASSERT_EQ(priority.localities.size(), 1);
+  const auto& p = *priority.localities.begin();
+  ASSERT_EQ(p.first, p.second.name.get());
+  EXPECT_EQ(p.first->region(), "myregion");
+  EXPECT_EQ(p.first->zone(), "myzone");
+  EXPECT_EQ(p.first->sub_zone(), "mysubzone");
+  EXPECT_EQ(p.second.lb_weight, 1);
+  ASSERT_EQ(p.second.endpoints.size(), 1);
+  const auto& address = p.second.endpoints.front();
+  auto addr = grpc_sockaddr_to_string(&address.address(), /*normalize=*/false);
+  ASSERT_TRUE(addr.ok()) << addr.status();
+  EXPECT_EQ(*addr, "127.0.0.1:443");
+  EXPECT_EQ(address.args(), ChannelArgs()
+                                .Set(GRPC_ARG_ADDRESS_WEIGHT, 1)
+                                .Set(GRPC_ARG_XDS_HEALTH_STATUS,
+                                     XdsHealthStatus::HealthStatus::kUnknown));
+  EXPECT_EQ(resource.drop_config, nullptr);
+}
+
 }  // namespace
 }  // namespace testing
 }  // namespace grpc_core
diff --git a/test/cpp/end2end/xds/BUILD b/test/cpp/end2end/xds/BUILD
index f247f14425b..d11533f091e 100644
--- a/test/cpp/end2end/xds/BUILD
+++ b/test/cpp/end2end/xds/BUILD
@@ -568,3 +568,27 @@ grpc_cc_test(
         "//test/core/test_util:scoped_env_var",
     ],
 )
+
+grpc_cc_test(
+    name = "xds_http_connect_end2end_test",
+    srcs = ["xds_http_connect_end2end_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
+    linkstatic = True,  # Fixes dyld error on MacOS
+    tags = [
+        "no_test_ios",
+        "no_windows",
+        "xds_end2end_test",
+    ],  # TODO(jtattermusch): fix test on windows
+    deps = [
+        ":xds_end2end_test_lib",
+        "//:gpr",
+        "//:grpc",
+        "//:grpc++",
+        "//src/proto/grpc/testing/xds/v3:address_proto",
+        "//src/proto/grpc/testing/xds/v3:upstream_http_11_connect_proto",
+        "//test/core/end2end:http_proxy",
+        "//test/core/test_util:scoped_env_var",
+    ],
+)
diff --git a/test/cpp/end2end/xds/xds_http_connect_end2end_test.cc b/test/cpp/end2end/xds/xds_http_connect_end2end_test.cc
new file mode 100644
index 00000000000..59cd57733d2
--- /dev/null
+++ b/test/cpp/end2end/xds/xds_http_connect_end2end_test.cc
@@ -0,0 +1,173 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <string>
+#include <vector>
+
+#include "absl/log/log.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "src/core/client_channel/backup_poller.h"
+#include "src/core/lib/config/config_vars.h"
+#include "src/proto/grpc/testing/xds/v3/address.grpc.pb.h"
+#include "src/proto/grpc/testing/xds/v3/upstream_http_11_connect.grpc.pb.h"
+#include "test/core/end2end/fixtures/http_proxy_fixture.h"
+#include "test/core/test_util/resolve_localhost_ip46.h"
+#include "test/core/test_util/scoped_env_var.h"
+#include "test/cpp/end2end/xds/xds_end2end_test_lib.h"
+
+namespace grpc {
+namespace testing {
+namespace {
+
+using envoy::extensions::transport_sockets::http_11_proxy::v3::
+    Http11ProxyUpstreamTransport;
+
+class XdsHttpProxyTest : public XdsEnd2endTest {
+ protected:
+  void SetUp() override {
+    http_proxy_ = grpc_end2end_http_proxy_create(nullptr);
+    XdsEnd2endTest::SetUp();
+  }
+
+  void TearDown() override {
+    XdsEnd2endTest::TearDown();
+    grpc_end2end_http_proxy_destroy(http_proxy_);
+  }
+
+  grpc_end2end_http_proxy* http_proxy_;
+};
+
+INSTANTIATE_TEST_SUITE_P(XdsTest, XdsHttpProxyTest,
+                         ::testing::Values(XdsTestType()), &XdsTestType::Name);
+
+TEST_P(XdsHttpProxyTest, TransportProxyInClusterAndProxyAddressInEndpoint) {
+  grpc_core::testing::ScopedExperimentalEnvVar env(
+      "GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  CreateAndStartBackends(1);
+  // Set transport socket in CDS.
+  Cluster cluster = default_cluster_;
+  cluster.mutable_transport_socket()->mutable_typed_config()->PackFrom(
+      Http11ProxyUpstreamTransport());
+  balancer_->ads_service()->SetCdsResource(cluster);
+  // Set proxy address in EDS metadata.
+  ClusterLoadAssignment endpoints = BuildEdsResource(
+      EdsResourceArgs({{"locality0", CreateEndpointsForBackends()}}));
+  envoy::config::core::v3::Address proxy_address_proto;
+  auto* socket_address = proxy_address_proto.mutable_socket_address();
+  socket_address->set_address(grpc_core::LocalIp());
+  socket_address->set_port_value(
+      grpc_end2end_http_proxy_get_proxy_port(http_proxy_));
+  auto& metadata_map = *endpoints.mutable_endpoints(0)
+                            ->mutable_lb_endpoints(0)
+                            ->mutable_metadata()
+                            ->mutable_typed_filter_metadata();
+  metadata_map["envoy.http11_proxy_transport_socket.proxy_address"].PackFrom(
+      proxy_address_proto);
+  balancer_->ads_service()->SetEdsResource(endpoints);
+  // Everything should work.
+  CheckRpcSendOk(DEBUG_LOCATION);
+  // Proxy should have seen one connection.
+  EXPECT_EQ(grpc_end2end_http_proxy_num_connections(http_proxy_), 1);
+}
+
+TEST_P(XdsHttpProxyTest, TransportProxyInClusterButNoProxyAddressInEndpoint) {
+  grpc_core::testing::ScopedExperimentalEnvVar env(
+      "GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  CreateAndStartBackends(1);
+  // Set transport socket in CDS.
+  Cluster cluster = default_cluster_;
+  cluster.mutable_transport_socket()->mutable_typed_config()->PackFrom(
+      Http11ProxyUpstreamTransport());
+  balancer_->ads_service()->SetCdsResource(cluster);
+  // Set proxy address in EDS metadata.
+  ClusterLoadAssignment endpoints = BuildEdsResource(
+      EdsResourceArgs({{"locality0", CreateEndpointsForBackends()}}));
+  balancer_->ads_service()->SetEdsResource(endpoints);
+  // Everything should work.
+  CheckRpcSendOk(DEBUG_LOCATION);
+  // Proxy should not have seen any connections.
+  EXPECT_EQ(grpc_end2end_http_proxy_num_connections(http_proxy_), 0);
+}
+
+TEST_P(XdsHttpProxyTest, ProxyAddressInEndpointButNoTransportProxyInCluster) {
+  grpc_core::testing::ScopedExperimentalEnvVar env(
+      "GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
+  CreateAndStartBackends(1);
+  // Set proxy address in EDS metadata.
+  ClusterLoadAssignment endpoints = BuildEdsResource(
+      EdsResourceArgs({{"locality0", CreateEndpointsForBackends()}}));
+  envoy::config::core::v3::Address proxy_address_proto;
+  auto* socket_address = proxy_address_proto.mutable_socket_address();
+  socket_address->set_address(grpc_core::LocalIp());
+  socket_address->set_port_value(
+      grpc_end2end_http_proxy_get_proxy_port(http_proxy_));
+  auto& metadata_map = *endpoints.mutable_endpoints(0)
+                            ->mutable_lb_endpoints(0)
+                            ->mutable_metadata()
+                            ->mutable_typed_filter_metadata();
+  metadata_map["envoy.http11_proxy_transport_socket.proxy_address"].PackFrom(
+      proxy_address_proto);
+  balancer_->ads_service()->SetEdsResource(endpoints);
+  // Everything should work.
+  CheckRpcSendOk(DEBUG_LOCATION);
+  // Proxy should not have seen any connections.
+  EXPECT_EQ(grpc_end2end_http_proxy_num_connections(http_proxy_), 0);
+}
+
+TEST_P(XdsHttpProxyTest, CdsNackedWhenNotEnabled) {
+  // Set transport socket in CDS.
+  Cluster cluster = default_cluster_;
+  cluster.mutable_transport_socket()->mutable_typed_config()->PackFrom(
+      Http11ProxyUpstreamTransport());
+  balancer_->ads_service()->SetCdsResource(cluster);
+  // Wait for NACK.
+  const auto response_state = WaitForCdsNack(DEBUG_LOCATION);
+  ASSERT_TRUE(response_state.has_value()) << "timed out waiting for NACK";
+  EXPECT_EQ(response_state->error_message,
+            "xDS response validation errors: ["
+            "resource index 0: cluster_name: "
+            "INVALID_ARGUMENT: errors validating Cluster resource: ["
+            "field:transport_socket.typed_config.value["
+            "envoy.extensions.transport_sockets.http_11_proxy.v3"
+            ".Http11ProxyUpstreamTransport].type_url "
+            "error:unsupported transport socket type]]");
+}
+
+}  // namespace
+}  // namespace testing
+}  // namespace grpc
+
+int main(int argc, char** argv) {
+  grpc::testing::TestEnvironment env(&argc, argv);
+  ::testing::InitGoogleTest(&argc, argv);
+  // Make the backup poller poll very frequently in order to pick up
+  // updates from all the subchannels's FDs.
+  grpc_core::ConfigVars::Overrides overrides;
+  overrides.client_channel_backup_poll_interval_ms = 1;
+  grpc_core::ConfigVars::SetOverrides(overrides);
+#if TARGET_OS_IPHONE
+  // Workaround Apple CFStream bug
+  grpc_core::SetEnv("grpc_cfstream", "0");
+#endif
+  grpc_init();
+  const auto result = RUN_ALL_TESTS();
+  grpc_shutdown();
+  return result;
+}
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 4147fafc791..5553d2c515d 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1516,6 +1516,9 @@ src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_
 src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h \
 src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c \
 src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h \
 src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h \
 src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c \
 src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h \
@@ -1925,6 +1928,8 @@ src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manage
 src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h \
 src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
 src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h \
 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h \
 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
@@ -2096,6 +2101,8 @@ src/core/handshaker/http_connect/http_connect_handshaker.cc \
 src/core/handshaker/http_connect/http_connect_handshaker.h \
 src/core/handshaker/http_connect/http_proxy_mapper.cc \
 src/core/handshaker/http_connect/http_proxy_mapper.h \
+src/core/handshaker/http_connect/xds_http_proxy_mapper.cc \
+src/core/handshaker/http_connect/xds_http_proxy_mapper.h \
 src/core/handshaker/proxy_mapper.h \
 src/core/handshaker/proxy_mapper_registry.cc \
 src/core/handshaker/proxy_mapper_registry.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index cf962517d9e..70acd1ce0dd 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1283,6 +1283,9 @@ src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_
 src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h \
 src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.c \
 src/core/ext/upb-gen/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb_minitable.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb.h \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.c \
+src/core/ext/upb-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upb_minitable.h \
 src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb.h \
 src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.c \
 src/core/ext/upb-gen/envoy/extensions/transport_sockets/tls/v3/cert.upb_minitable.h \
@@ -1692,6 +1695,8 @@ src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manage
 src/core/ext/upbdefs-gen/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h \
 src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.c \
 src/core/ext/upbdefs-gen/envoy/extensions/http/stateful_session/cookie/v3/cookie.upbdefs.h \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.c \
+src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.upbdefs.h \
 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c \
 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h \
 src/core/ext/upbdefs-gen/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c \
@@ -1863,6 +1868,8 @@ src/core/handshaker/http_connect/http_connect_handshaker.cc \
 src/core/handshaker/http_connect/http_connect_handshaker.h \
 src/core/handshaker/http_connect/http_proxy_mapper.cc \
 src/core/handshaker/http_connect/http_proxy_mapper.h \
+src/core/handshaker/http_connect/xds_http_proxy_mapper.cc \
+src/core/handshaker/http_connect/xds_http_proxy_mapper.h \
 src/core/handshaker/proxy_mapper.h \
 src/core/handshaker/proxy_mapper_registry.cc \
 src/core/handshaker/proxy_mapper_registry.h \
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 815a4fc2b0e..4252389b07a 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -12247,6 +12247,28 @@
     ],
     "uses_polling": true
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "xds_http_connect_end2end_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix"
+    ],
+    "uses_polling": true
+  },
   {
     "args": [],
     "benchmark": false,

From 6bfaae44680746bb65bd20d8ddefc64fa7d4ea6e Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 11 Oct 2024 15:22:47 -0700
Subject: [PATCH 67/74] [call-v3] Add state machinery for flow control (#37867)

So far missing for HTTP/2 style flow control has been a primitive to query whether there's a receiver for flow control data at the other end of the message pipes.

Here I'm updating the state machine accessors to accommodate that functionality.

No new states were needed.

Whilst here, document the current member functions on `CallState`.

Closes #37867

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37867 from ctiller:like-the-river c9814c737da1ec82ba240786e9bafd8c65b35b5b
PiperOrigin-RevId: 684972125
---
 src/core/lib/transport/call_state.h    | 105 +++++++++++++++++++++++--
 test/core/transport/call_state_test.cc |  33 ++++++++
 2 files changed, 133 insertions(+), 5 deletions(-)

diff --git a/src/core/lib/transport/call_state.h b/src/core/lib/transport/call_state.h
index 1c58a9d61a5..01d97e84d21 100644
--- a/src/core/lib/transport/call_state.h
+++ b/src/core/lib/transport/call_state.h
@@ -29,29 +29,80 @@ namespace grpc_core {
 class CallState {
  public:
   CallState();
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Misc events
+
   // Start the call: allows pulls to proceed
   void Start();
+
+  /////////////////////////////////////////////////////////////////////////////
   // PUSH: client -> server
+
+  // Poll for the next message pull to be started.
+  // This can be used for flow control by waiting for the reader to request
+  // data, then providing flow control tokens to read, and finally pushing the
+  // message.
+  Poll<StatusFlag> PollPullClientToServerMessageStarted();
+
+  // Begin a message push.
   void BeginPushClientToServerMessage();
+
+  // Poll for the push to be completed (up to FinishPullClientToServerMessage).
   Poll<StatusFlag> PollPushClientToServerMessage();
+
+  // Note that the client has half-closed the stream.
   void ClientToServerHalfClose();
+
+  /////////////////////////////////////////////////////////////////////////////
   // PULL: client -> server
+
+  // Begin pulling client initial metadata.
   void BeginPullClientInitialMetadata();
+  // Finish pulling client initial metadata.
   void FinishPullClientInitialMetadata();
+  // Poll for the next message pull to be available.
+  // Resolves to true if a message is available, false if the call is
+  // half-closed, and Failure if the call is cancelled.
   Poll<ValueOrFailure<bool>> PollPullClientToServerMessageAvailable();
+  // Finish pulling a message.
   void FinishPullClientToServerMessage();
+
+  /////////////////////////////////////////////////////////////////////////////
   // PUSH: server -> client
+
+  // Push server initial metadata (instantaneous).
   StatusFlag PushServerInitialMetadata();
+  // Poll for the next message pull to be started.
+  // This can be used for flow control by waiting for the reader to request
+  // data, then providing flow control tokens to read, and finally pushing the
+  // message.
+  Poll<StatusFlag> PollPullServerToClientMessageStarted();
+  // Begin a message push.
   void BeginPushServerToClientMessage();
+  // Poll for the push to be completed (up to FinishPullServerToClientMessage).
   Poll<StatusFlag> PollPushServerToClientMessage();
+  // Push server trailing metadata.
+  // This is idempotent: only the first call will have any effect.
+  // Returns true if this is the first call.
   bool PushServerTrailingMetadata(bool cancel);
+
+  /////////////////////////////////////////////////////////////////////////////
   // PULL: server -> client
+
+  // Poll for initial metadata to be available.
   Poll<bool> PollPullServerInitialMetadataAvailable();
+  // Finish pulling server initial metadata.
   void FinishPullServerInitialMetadata();
+  // Poll for the next message pull to be available.
+  // Resolves to true if a message is available, false if trailing metadata is
+  // ready, and Failure if the call is cancelled.
   Poll<ValueOrFailure<bool>> PollPullServerToClientMessageAvailable();
+  // Finish pulling a message.
   void FinishPullServerToClientMessage();
+  // Poll for trailing metadata to be available.
   Poll<Empty> PollServerTrailingMetadataAvailable();
-  void FinishPullServerTrailingMetadata();
+  // Instantaneously return true if server trailing metadata has been pulled.
   bool WasServerTrailingMetadataPulled() const;
   // Resolves after server trailing metadata has been pulled, to true if the
   // call was cancelled, and false otherwise.
@@ -59,6 +110,8 @@ class CallState {
   // Return true if server trailing metadata has been pushed *and* that push was
   // a cancellation.
   bool WasCancelledPushed() const;
+
+  /////////////////////////////////////////////////////////////////////////////
   // Debug
   std::string DebugString() const;
 
@@ -419,6 +472,7 @@ CallState::PollPullClientToServerMessageAvailable() {
       return client_to_server_pull_waiter_.pending();
     case ClientToServerPullState::kIdle:
       client_to_server_pull_state_ = ClientToServerPullState::kReading;
+      client_to_server_pull_waiter_.Wake();
       ABSL_FALLTHROUGH_INTENDED;
     case ClientToServerPullState::kReading:
       break;
@@ -447,6 +501,25 @@ CallState::PollPullClientToServerMessageAvailable() {
   Crash("Unreachable");
 }
 
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<StatusFlag>
+CallState::PollPullClientToServerMessageStarted() {
+  GRPC_TRACE_LOG(call_state, INFO)
+      << "[call_state] PollPullClientToServerMessageStarted: "
+      << GRPC_DUMP_ARGS(this, client_to_server_pull_state_);
+  switch (client_to_server_pull_state_) {
+    case ClientToServerPullState::kBegin:
+    case ClientToServerPullState::kProcessingClientInitialMetadata:
+    case ClientToServerPullState::kIdle:
+      return client_to_server_pull_waiter_.pending();
+    case ClientToServerPullState::kReading:
+    case ClientToServerPullState::kProcessingClientToServerMessage:
+      return Success{};
+    case ClientToServerPullState::kTerminated:
+      return Failure{};
+  }
+  Crash("Unreachable");
+}
+
 GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void
 CallState::FinishPullClientToServerMessage() {
   GRPC_TRACE_LOG(call_state, INFO)
@@ -758,6 +831,7 @@ CallState::PollPullServerToClientMessageAvailable() {
       return server_to_client_pull_waiter_.pending();
     case ServerToClientPullState::kIdle:
       server_to_client_pull_state_ = ServerToClientPullState::kReading;
+      server_to_client_pull_waiter_.Wake();
       ABSL_FALLTHROUGH_INTENDED;
     case ServerToClientPullState::kReading:
       break;
@@ -797,6 +871,29 @@ CallState::PollPullServerToClientMessageAvailable() {
   Crash("Unreachable");
 }
 
+GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline Poll<StatusFlag>
+CallState::PollPullServerToClientMessageStarted() {
+  GRPC_TRACE_LOG(call_state, INFO)
+      << "[call_state] PollPullClientToServerMessageStarted: "
+      << GRPC_DUMP_ARGS(this, server_to_client_pull_state_);
+  switch (server_to_client_pull_state_) {
+    case ServerToClientPullState::kUnstarted:
+    case ServerToClientPullState::kUnstartedReading:
+    case ServerToClientPullState::kStarted:
+    case ServerToClientPullState::kProcessingServerInitialMetadata:
+    case ServerToClientPullState::kProcessingServerInitialMetadataReading:
+    case ServerToClientPullState::kIdle:
+      return server_to_client_pull_waiter_.pending();
+    case ServerToClientPullState::kStartedReading:
+    case ServerToClientPullState::kReading:
+    case ServerToClientPullState::kProcessingServerToClientMessage:
+      return Success{};
+    case ServerToClientPullState::kTerminated:
+      return Failure{};
+  }
+  Crash("Unreachable");
+}
+
 GPR_ATTRIBUTE_ALWAYS_INLINE_FUNCTION inline void
 CallState::FinishPullServerToClientMessage() {
   GRPC_TRACE_LOG(call_state, INFO)
@@ -892,9 +989,6 @@ CallState::PollServerTrailingMetadataAvailable() {
   server_to_client_pull_state_ = ServerToClientPullState::kTerminated;
   server_to_client_pull_waiter_.Wake();
   switch (server_trailing_metadata_state_) {
-    case ServerTrailingMetadataState::kNotPushed:
-      LOG(FATAL) << "FinishPullServerTrailingMetadata called before "
-                    "PollServerTrailingMetadataAvailable";
     case ServerTrailingMetadataState::kPushed:
       server_trailing_metadata_state_ = ServerTrailingMetadataState::kPulled;
       server_trailing_metadata_waiter_.Wake();
@@ -904,9 +998,10 @@ CallState::PollServerTrailingMetadataAvailable() {
           ServerTrailingMetadataState::kPulledCancel;
       server_trailing_metadata_waiter_.Wake();
       break;
+    case ServerTrailingMetadataState::kNotPushed:
     case ServerTrailingMetadataState::kPulled:
     case ServerTrailingMetadataState::kPulledCancel:
-      LOG(FATAL) << "FinishPullServerTrailingMetadata called twice";
+      LOG(FATAL) << "PollServerTrailingMetadataAvailable completed twice";
   }
   return Empty{};
 }
diff --git a/test/core/transport/call_state_test.cc b/test/core/transport/call_state_test.cc
index 4ad4a0ebe80..d8b14eab6aa 100644
--- a/test/core/transport/call_state_test.cc
+++ b/test/core/transport/call_state_test.cc
@@ -300,6 +300,39 @@ TEST(CallStateTest, ReceiveTrailingMetadataAfterMessageRead) {
   EXPECT_THAT(state.PollServerTrailingMetadataAvailable(), IsReady());
 }
 
+TEST(CallStateTest, CanWaitForPullClientMessage) {
+  StrictMock<MockActivity> activity;
+  activity.Activate();
+  CallState state;
+  state.Start();
+  EXPECT_THAT(state.PollPullClientToServerMessageStarted(), IsPending());
+  state.BeginPullClientInitialMetadata();
+  EXPECT_THAT(state.PollPullClientToServerMessageStarted(), IsPending());
+  // TODO(ctiller): consider adding another wakeup set to CallState to eliminate
+  // this wakeup (trade memory for cpu)
+  EXPECT_WAKEUP(activity, state.FinishPullClientInitialMetadata());
+  EXPECT_THAT(state.PollPullClientToServerMessageStarted(), IsPending());
+  EXPECT_WAKEUP(activity, state.PollPullClientToServerMessageAvailable());
+  EXPECT_THAT(state.PollPullClientToServerMessageStarted(), IsReady(Success{}));
+}
+
+TEST(CallStateTest, CanWaitForPullServerMessage) {
+  StrictMock<MockActivity> activity;
+  activity.Activate();
+  CallState state;
+  state.Start();
+  EXPECT_THAT(state.PollPullServerToClientMessageStarted(), IsPending());
+  state.PushServerInitialMetadata();
+  EXPECT_THAT(state.PollPullServerToClientMessageStarted(), IsPending());
+  EXPECT_WAKEUP(
+      activity,
+      EXPECT_THAT(state.PollPullServerInitialMetadataAvailable(), IsReady()));
+  state.FinishPullServerInitialMetadata();
+  EXPECT_THAT(state.PollPullServerToClientMessageStarted(), IsPending());
+  EXPECT_WAKEUP(activity, state.PollPullServerToClientMessageAvailable());
+  EXPECT_THAT(state.PollPullServerToClientMessageStarted(), IsReady(Success{}));
+}
+
 }  // namespace grpc_core
 
 int main(int argc, char** argv) {

From 1a422ebc295e0fa5efe402008e280b876f8ed5a8 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 11 Oct 2024 15:56:45 -0700
Subject: [PATCH 68/74] [latent_see] Move latent_see to be behind a build
 define, not a config (#37897)

This will allow latent_see to be used with different build configurations in the future (and eventually perhaps defaulted on for some CI runs to aid postmortem debugging of test failures)

Closes #37897

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37897 from ctiller:latent-peek 52cbf36ce59a74c48b36a9685453e0e9386c6cd0
PiperOrigin-RevId: 684981143
---
 src/core/BUILD | 9 +++++++++
 tools/bazel.rc | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/core/BUILD b/src/core/BUILD
index 72068744980..a566a3bd574 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -29,6 +29,11 @@ package(
     ],
 )
 
+config_setting(
+    name = "enable_latent_see",
+    values = {"define": "GRPC_ENABLE_LATENT_SEE=1"},
+)
+
 # This is needed as a transitionary mechanism to build the src/core targets in
 # the top-level BUILD file that have not yet been moved here. Should go away
 # once the transition is complete.
@@ -141,6 +146,10 @@ grpc_cc_library(
     hdrs = [
         "util/latent_see.h",
     ],
+    defines = select({
+        ":enable_latent_see": ["GRPC_ENABLE_LATENT_SEE"],
+        "//conditions:default": [],
+    }),
     external_deps = [
         "absl/base:core_headers",
         "absl/functional:any_invocable",
diff --git a/tools/bazel.rc b/tools/bazel.rc
index 379f6d4c3d2..3d98df37012 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -35,8 +35,6 @@ build --define=use_fast_cpp_protos=true
 build:opt --compilation_mode=opt
 build:opt --copt=-Wframe-larger-than=16384
 
-build:latent_see --copt=-DGRPC_ENABLE_LATENT_SEE
-
 build:dbg --compilation_mode=dbg
 
 # Dynamic link cause issues like: `dyld: malformed mach-o: load commands size (59272) > 32768`

From 92c9dec6c4be8ec835273242a391a0b1c6aa11db Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 11 Oct 2024 17:44:13 -0700
Subject: [PATCH 69/74] [benchmarks] Enable monitoring on a swath of benchmarks
 (#37903)

We'll probably disable some next week :)
But I want to watch a good selection and refine criteria for acceptance.

Closes #37903

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37903 from ctiller:ALL-the-things 5f829db87019ae81c64fceaf679d5adc50e115dd
PiperOrigin-RevId: 685010911
---
 test/core/call/BUILD                 |  1 +
 test/core/client_channel/BUILD       |  2 ++
 test/core/experiments/BUILD          |  1 +
 test/core/filters/BUILD              |  1 +
 test/core/load_balancing/BUILD       |  2 ++
 test/core/promise/BUILD              |  1 +
 test/core/transport/BUILD            |  1 +
 test/core/transport/benchmarks/BUILD |  2 ++
 test/cpp/microbenchmarks/BUILD       | 19 +++++++++++++++++++
 9 files changed, 30 insertions(+)

diff --git a/test/core/call/BUILD b/test/core/call/BUILD
index 75a590cd3e7..6f93626ada3 100644
--- a/test/core/call/BUILD
+++ b/test/core/call/BUILD
@@ -82,6 +82,7 @@ grpc_cc_library(
 grpc_cc_benchmark(
     name = "bm_client_call",
     srcs = ["bm_client_call.cc"],
+    monitoring = True,
     deps = [
         "//:grpc",
         "//src/core:default_event_engine",
diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD
index 03eda2d7ca8..18a6137dddc 100644
--- a/test/core/client_channel/BUILD
+++ b/test/core/client_channel/BUILD
@@ -121,6 +121,7 @@ grpc_cc_test(
 grpc_cc_benchmark(
     name = "bm_client_channel",
     srcs = ["bm_client_channel.cc"],
+    monitoring = True,
     deps = [
         "//:grpc",
         "//src/core:default_event_engine",
@@ -131,6 +132,7 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_load_balanced_call_destination",
     srcs = ["bm_load_balanced_call_destination.cc"],
+    monitoring = True,
     deps = [
         "//:grpc",
         "//src/core:default_event_engine",
diff --git a/test/core/experiments/BUILD b/test/core/experiments/BUILD
index 180c3d80482..330b980e64f 100644
--- a/test/core/experiments/BUILD
+++ b/test/core/experiments/BUILD
@@ -35,6 +35,7 @@ grpc_cc_library(
 grpc_cc_benchmark(
     name = "bm_experiments",
     srcs = ["bm_experiments.cc"],
+    monitoring = True,
     deps = [
         "//src/core:experiments",
         "//test/core/test_util:grpc_test_util",
diff --git a/test/core/filters/BUILD b/test/core/filters/BUILD
index 1674eefb08a..299a6705cba 100644
--- a/test/core/filters/BUILD
+++ b/test/core/filters/BUILD
@@ -144,6 +144,7 @@ grpc_cc_test(
 grpc_cc_benchmark(
     name = "bm_http_client_filter",
     srcs = ["bm_http_client_filter.cc"],
+    monitoring = True,
     deps = [
         "//:grpc",
         "//src/core:default_event_engine",
diff --git a/test/core/load_balancing/BUILD b/test/core/load_balancing/BUILD
index 2c1db10851f..e4ca4f48938 100644
--- a/test/core/load_balancing/BUILD
+++ b/test/core/load_balancing/BUILD
@@ -203,6 +203,7 @@ grpc_cc_benchmark(
         "absl/algorithm:container",
         "absl/log:check",
     ],
+    monitoring = True,
     uses_event_engine = False,
     deps = [
         "//src/core:no_destruct",
@@ -273,6 +274,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/strings",
     ],
+    monitoring = True,
     deps = [
         "//:config",
         "//:grpc",
diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD
index 318756063fc..89c617ca622 100644
--- a/test/core/promise/BUILD
+++ b/test/core/promise/BUILD
@@ -690,6 +690,7 @@ grpc_cc_test(
 grpc_cc_benchmark(
     name = "bm_party",
     srcs = ["bm_party.cc"],
+    monitoring = True,
     deps = [
         "//:grpc",
         "//src/core:1999",
diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD
index 068d2333265..4105be3038c 100644
--- a/test/core/transport/BUILD
+++ b/test/core/transport/BUILD
@@ -255,6 +255,7 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_metadata",
     srcs = ["bm_metadata.cc"],
+    monitoring = True,
     deps = [
         ":call_spine_benchmarks",
         "//:grpc",
diff --git a/test/core/transport/benchmarks/BUILD b/test/core/transport/benchmarks/BUILD
index d01eacf556a..bbc871e1976 100644
--- a/test/core/transport/benchmarks/BUILD
+++ b/test/core/transport/benchmarks/BUILD
@@ -24,6 +24,7 @@ grpc_package(
 grpc_cc_benchmark(
     name = "bm_chaotic_good",
     srcs = ["bm_chaotic_good.cc"],
+    monitoring = True,
     deps = [
         "//:grpc",
         "//src/core:chaotic_good_client_transport",
@@ -37,6 +38,7 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_inproc",
     srcs = ["bm_inproc.cc"],
+    monitoring = True,
     deps = [
         "//:grpc",
         "//src/core:chaotic_good_client_transport",
diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
index 218b0994f1f..ff84dfaae71 100644
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@@ -31,6 +31,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/container:btree",
     ],
+    monitoring = True,
     deps = [
         "//:grpc++",
         "//src/core:channel_args",
@@ -44,6 +45,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/container:btree",
     ],
+    monitoring = True,
     deps = [
         "//:grpc++",
         "//src/core:channel_args",
@@ -65,6 +67,7 @@ grpc_cc_benchmark(
         "absl/log:check",
         "absl/debugging:leak_check",
     ],
+    monitoring = True,
     deps = [
         ":helpers",
         "//src/core:common_event_engine_closures",
@@ -77,6 +80,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
+    monitoring = True,
     uses_event_engine = False,
     deps = [
         ":helpers",
@@ -132,6 +136,7 @@ grpc_cc_library(
 grpc_cc_benchmark(
     name = "bm_closure",
     srcs = ["bm_closure.cc"],
+    monitoring = True,
     deps = [
         ":helpers",
         "//src/core:closure",
@@ -141,6 +146,7 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_huffman_decode",
     srcs = ["bm_huffman_decode.cc"],
+    monitoring = True,
     tags = [
         "nomsan",
         "notsan",
@@ -155,12 +161,14 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_alarm",
     srcs = ["bm_alarm.cc"],
+    monitoring = True,
     deps = [":helpers"],
 )
 
 grpc_cc_benchmark(
     name = "bm_arena",
     srcs = ["bm_arena.cc"],
+    monitoring = True,
     tags = [
         "notsan",
     ],
@@ -174,6 +182,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
+    monitoring = True,
     tags = [
         "no_mac",
         "no_windows",
@@ -185,6 +194,7 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_channel",
     srcs = ["bm_channel.cc"],
+    monitoring = True,
     tags = [
         "no_mac",
         "no_windows",
@@ -199,6 +209,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
+    monitoring = True,
     deps = [":helpers"],
 )
 
@@ -235,6 +246,7 @@ grpc_cc_benchmark(
         "bm_fullstack_streaming_ping_pong.cc",
     ],
     flaky = True,
+    monitoring = True,
     deps = [":fullstack_streaming_ping_pong_h"],
 )
 
@@ -276,6 +288,7 @@ grpc_cc_benchmark(
     srcs = [
         "bm_fullstack_unary_ping_pong.cc",
     ],
+    monitoring = True,
     deps = [":fullstack_unary_ping_pong_h"],
 )
 
@@ -284,6 +297,7 @@ grpc_cc_benchmark(
     srcs = [
         "bm_fullstack_unary_ping_pong_chaotic_good.cc",
     ],
+    monitoring = True,
     deps = [
         ":fullstack_unary_ping_pong_h",
         "//:grpcpp_chaotic_good",
@@ -296,6 +310,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
+    monitoring = True,
     uses_event_engine = False,
     deps = [
         ":helpers",
@@ -350,6 +365,7 @@ grpc_cc_benchmark(
     srcs = [
         "bm_callback_unary_ping_pong.cc",
     ],
+    monitoring = True,
     deps = [":callback_unary_ping_pong_h"],
 )
 
@@ -373,6 +389,7 @@ grpc_cc_benchmark(
     srcs = [
         "bm_callback_streaming_ping_pong.cc",
     ],
+    monitoring = True,
     deps = [":callback_streaming_ping_pong_h"],
 )
 
@@ -383,6 +400,7 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
+    monitoring = True,
     tags = [
         "manual",
         "notap",
@@ -402,6 +420,7 @@ grpc_cc_benchmark(
         "absl/strings",
         "otel/sdk/src/metrics",
     ],
+    monitoring = True,
     deps = [
         ":helpers",
         "//src/core:metrics",

From a59f47a8020a965111ebd544769e4ed0570b2dd4 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Fri, 11 Oct 2024 21:09:46 -0700
Subject: [PATCH 70/74] [doc] Add documentation for StartCall() on CQ based
 streaming async API (#37904)

Closes #37904

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37904 from yashykt:StartCallDoc 1d1bbde6dd317f41974a23ed4f1808804fc5b1ae
PiperOrigin-RevId: 685064886
---
 include/grpcpp/support/async_stream.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/grpcpp/support/async_stream.h b/include/grpcpp/support/async_stream.h
index 931d321a982..7264fa15045 100644
--- a/include/grpcpp/support/async_stream.h
+++ b/include/grpcpp/support/async_stream.h
@@ -38,7 +38,11 @@ class ClientAsyncStreamingInterface {
 
   /// Start the call that was set up by the constructor, but only if the
   /// constructor was invoked through the "Prepare" API which doesn't actually
-  /// start the call
+  /// start the call.
+  ///
+  /// It is illegal to start a write-type operation (eg. Write(), WriteLast(),
+  /// WritesDone()) while the `StartCall()` operation has not finished
+  /// (determined by the returning of \a tag).
   virtual void StartCall(void* tag) = 0;
 
   /// Request notification of the reading of the initial metadata. Completion

From a9038be11e8437594fde2a08c2bbed44559ee481 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Sat, 12 Oct 2024 10:47:21 -0700
Subject: [PATCH 71/74] [benchmarks] Disable monitoring on some of our larger
 microbenchmarks for now (#37905)

These look too large for the configured timeouts internally... will revisit later once the system is starting to be more ready.

Closes #37905

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37905 from ctiller:lol-nope 6d44e515b31405cd4b70954cb9ebbd2391c3d6c0
PiperOrigin-RevId: 685223450
---
 test/cpp/microbenchmarks/BUILD | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
index ff84dfaae71..28f7e4fba0d 100644
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@@ -67,7 +67,6 @@ grpc_cc_benchmark(
         "absl/log:check",
         "absl/debugging:leak_check",
     ],
-    monitoring = True,
     deps = [
         ":helpers",
         "//src/core:common_event_engine_closures",
@@ -146,7 +145,6 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_huffman_decode",
     srcs = ["bm_huffman_decode.cc"],
-    monitoring = True,
     tags = [
         "nomsan",
         "notsan",
@@ -168,7 +166,6 @@ grpc_cc_benchmark(
 grpc_cc_benchmark(
     name = "bm_arena",
     srcs = ["bm_arena.cc"],
-    monitoring = True,
     tags = [
         "notsan",
     ],
@@ -182,7 +179,6 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
-    monitoring = True,
     tags = [
         "no_mac",
         "no_windows",
@@ -246,7 +242,6 @@ grpc_cc_benchmark(
         "bm_fullstack_streaming_ping_pong.cc",
     ],
     flaky = True,
-    monitoring = True,
     deps = [":fullstack_streaming_ping_pong_h"],
 )
 
@@ -288,7 +283,6 @@ grpc_cc_benchmark(
     srcs = [
         "bm_fullstack_unary_ping_pong.cc",
     ],
-    monitoring = True,
     deps = [":fullstack_unary_ping_pong_h"],
 )
 
@@ -297,7 +291,6 @@ grpc_cc_benchmark(
     srcs = [
         "bm_fullstack_unary_ping_pong_chaotic_good.cc",
     ],
-    monitoring = True,
     deps = [
         ":fullstack_unary_ping_pong_h",
         "//:grpcpp_chaotic_good",
@@ -310,7 +303,6 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
-    monitoring = True,
     uses_event_engine = False,
     deps = [
         ":helpers",
@@ -389,7 +381,6 @@ grpc_cc_benchmark(
     srcs = [
         "bm_callback_streaming_ping_pong.cc",
     ],
-    monitoring = True,
     deps = [":callback_streaming_ping_pong_h"],
 )
 
@@ -400,7 +391,6 @@ grpc_cc_benchmark(
     external_deps = [
         "absl/log:check",
     ],
-    monitoring = True,
     tags = [
         "manual",
         "notap",

From 6c89e3909fa4754232212f5d09741db9c62e7fcc Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Sat, 12 Oct 2024 12:18:04 -0700
Subject: [PATCH 72/74] [benchmarks] Remove monitoring for one more expensive
 benchmark (#37906)

Closes #37906

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37906 from ctiller:lol-still-nope 754696369d419b27e717dbb959adeea876c2d50d
PiperOrigin-RevId: 685239520
---
 test/cpp/microbenchmarks/BUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD
index 28f7e4fba0d..77a8ab6bd4c 100644
--- a/test/cpp/microbenchmarks/BUILD
+++ b/test/cpp/microbenchmarks/BUILD
@@ -357,7 +357,6 @@ grpc_cc_benchmark(
     srcs = [
         "bm_callback_unary_ping_pong.cc",
     ],
-    monitoring = True,
     deps = [":callback_unary_ping_pong_h"],
 )
 

From 3cdb1335251ac3f1a4ff4fe469ebc83c7112dd04 Mon Sep 17 00:00:00 2001
From: Gregory Cooke <gregorycooke@google.com>
Date: Mon, 14 Oct 2024 10:26:07 -0700
Subject: [PATCH 73/74] [Test] Increase cpp security test timeout (#37915)

There's a timeout flake when running windows tests for the Static CRL Provider, let's see if increasing the timeout helps

Closes #37915

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37915 from gtcooke94:increase_test_deadline 0386aab78694e7843700100cb536c4fbf268127d
PiperOrigin-RevId: 685752852
---
 test/cpp/end2end/crl_provider_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc
index 3ea440294f3..e4201df2c0f 100644
--- a/test/cpp/end2end/crl_provider_test.cc
+++ b/test/cpp/end2end/crl_provider_test.cc
@@ -140,7 +140,7 @@ void DoRpc(const std::string& server_addr,
   grpc::testing::EchoResponse response;
   request.set_message(kMessage);
   ClientContext context;
-  context.set_deadline(grpc_timeout_seconds_to_deadline(/*time_s=*/10));
+  context.set_deadline(grpc_timeout_seconds_to_deadline(/*time_s=*/15));
   grpc::Status result = stub->Echo(&context, request, &response);
   if (expect_success) {
     EXPECT_TRUE(result.ok());

From 4ffcdd4ab7976cac397fcff25b6f952d0b5c8168 Mon Sep 17 00:00:00 2001
From: AJ Heller <hork@google.com>
Date: Mon, 14 Oct 2024 10:27:43 -0700
Subject: [PATCH 74/74] Delete gRPC C++ Binder implementation

PiperOrigin-RevId: 685753453
---
 BUILD                                         | 133 ---
 CMakeLists.txt                                | 866 ------------------
 Makefile                                      |   1 -
 Package.swift                                 |   1 -
 WORKSPACE                                     |  10 -
 build_autogenerated.yaml                      | 765 ----------------
 config.m4                                     |   2 -
 config.w32                                    |   2 -
 gRPC-C++.podspec                              |  61 --
 gRPC-Core.podspec                             |   1 -
 grpc.gemspec                                  |   1 -
 include/grpc/support/port_platform.h          |   1 -
 include/grpcpp/create_channel_binder.h        | 125 ---
 include/grpcpp/security/binder_credentials.h  |  43 -
 .../grpcpp/security/binder_security_policy.h  |  82 --
 package.xml                                   |   1 -
 src/core/BUILD                                |  32 +-
 src/core/ext/transport/binder/README.md       |  10 -
 .../binder/client/binder_connector.cc         | 134 ---
 .../binder/client/binder_connector.h          |  41 -
 .../transport/binder/client/channel_create.cc | 231 -----
 .../binder/client/channel_create_impl.cc      |  93 --
 .../binder/client/channel_create_impl.h       |  42 -
 .../binder/client/connection_id_generator.cc  |  69 --
 .../binder/client/connection_id_generator.h   |  50 -
 .../binder/client/endpoint_binder_pool.cc     | 114 ---
 .../binder/client/endpoint_binder_pool.h      |  64 --
 .../ext/transport/binder/client/jni_utils.cc  | 138 ---
 .../ext/transport/binder/client/jni_utils.h   |  57 --
 .../binder/client/security_policy_setting.cc  |  47 -
 .../binder/client/security_policy_setting.h   |  49 -
 src/core/ext/transport/binder/java/WORKSPACE  |   0
 .../binder/java/io/grpc/binder/cpp/BUILD      |  30 -
 .../grpc/binder/cpp/GrpcBinderConnection.java | 104 ---
 .../grpc/binder/cpp/GrpcCppServerBuilder.java |  40 -
 .../binder/cpp/NativeConnectionHelper.java    |  71 --
 .../security_policy/binder_security_policy.cc | 106 ---
 .../binder/security_policy/security_policy.h  |  40 -
 .../transport/binder/server/binder_server.cc  | 249 -----
 .../transport/binder/server/binder_server.h   |  65 --
 .../server/binder_server_credentials.cc       |  71 --
 .../binder/transport/binder_stream.h          | 117 ---
 .../binder/transport/binder_transport.cc      | 758 ---------------
 .../binder/transport/binder_transport.h       | 119 ---
 .../binder/utils/binder_auto_utils.h          |  76 --
 .../ext/transport/binder/utils/ndk_binder.cc  | 218 -----
 .../ext/transport/binder/utils/ndk_binder.h   | 107 ---
 .../binder/utils/transport_stream_receiver.h  |  70 --
 .../utils/transport_stream_receiver_impl.cc   | 257 ------
 .../utils/transport_stream_receiver_impl.h    | 112 ---
 .../ext/transport/binder/wire_format/binder.h | 104 ---
 .../binder/wire_format/binder_android.cc      | 308 -------
 .../binder/wire_format/binder_android.h       | 121 ---
 .../binder/wire_format/binder_constants.cc    |  29 -
 .../binder/wire_format/binder_constants.h     |  43 -
 .../binder/wire_format/transaction.cc         |  33 -
 .../binder/wire_format/transaction.h          | 106 ---
 .../binder/wire_format/wire_reader.h          |  38 -
 .../binder/wire_format/wire_reader_impl.cc    | 450 ---------
 .../binder/wire_format/wire_reader_impl.h     | 158 ----
 .../binder/wire_format/wire_writer.cc         | 393 --------
 .../binder/wire_format/wire_writer.h          | 126 ---
 .../plugin_registry/grpc_plugin_registry.cc   |   6 -
 src/core/resolver/binder/README.md            |   9 -
 src/core/resolver/binder/binder_resolver.cc   | 151 ---
 src/python/grpcio/grpc_core_dependencies.py   |   1 -
 test/core/resolver/BUILD                      |  16 -
 test/core/resolver/binder_resolver_test.cc    | 216 -----
 test/core/transport/binder/BUILD              | 133 ---
 .../transport/binder/binder_transport_test.cc | 729 ---------------
 test/core/transport/binder/end2end/BUILD      | 119 ---
 .../binder/end2end/binder_server_test.cc      | 243 -----
 .../end2end/end2end_binder_transport_test.cc  | 566 ------------
 .../transport/binder/end2end/fake_binder.cc   | 276 ------
 .../transport/binder/end2end/fake_binder.h    | 307 -------
 .../binder/end2end/fake_binder_test.cc        | 349 -------
 .../transport/binder/end2end/fuzzers/BUILD    | 101 --
 .../empty                                     |   0
 .../fuzzers/binder_transport_fuzzer.proto     |  81 --
 .../empty                                     |   0
 .../binder/end2end/fuzzers/client.proto       |  17 -
 .../binder/end2end/fuzzers/client_fuzzer.cc   | 158 ----
 .../binder/end2end/fuzzers/fuzzer_utils.cc    | 157 ----
 .../binder/end2end/fuzzers/fuzzer_utils.h     | 152 ---
 .../binder/end2end/fuzzers/server.proto       |  17 -
 .../binder/end2end/fuzzers/server_fuzzer.cc   | 132 ---
 .../binder/end2end/testing_channel_create.cc  | 133 ---
 .../binder/end2end/testing_channel_create.h   |  41 -
 .../binder/endpoint_binder_pool_test.cc       |  74 --
 test/core/transport/binder/mock_objects.cc    |  55 --
 test/core/transport/binder/mock_objects.h     | 121 ---
 .../binder/transport_stream_receiver_test.cc  | 287 ------
 .../core/transport/binder/wire_reader_test.cc | 376 --------
 .../core/transport/binder/wire_writer_test.cc | 265 ------
 tools/doxygen/Doxyfile.c++                    |   3 -
 tools/doxygen/Doxyfile.c++.internal           |  42 -
 tools/doxygen/Doxyfile.core.internal          |   3 -
 tools/run_tests/generated/tests.json          | 192 ----
 98 files changed, 1 insertion(+), 13312 deletions(-)
 delete mode 100644 include/grpcpp/create_channel_binder.h
 delete mode 100644 include/grpcpp/security/binder_credentials.h
 delete mode 100644 include/grpcpp/security/binder_security_policy.h
 delete mode 100644 src/core/ext/transport/binder/README.md
 delete mode 100644 src/core/ext/transport/binder/client/binder_connector.cc
 delete mode 100644 src/core/ext/transport/binder/client/binder_connector.h
 delete mode 100644 src/core/ext/transport/binder/client/channel_create.cc
 delete mode 100644 src/core/ext/transport/binder/client/channel_create_impl.cc
 delete mode 100644 src/core/ext/transport/binder/client/channel_create_impl.h
 delete mode 100644 src/core/ext/transport/binder/client/connection_id_generator.cc
 delete mode 100644 src/core/ext/transport/binder/client/connection_id_generator.h
 delete mode 100644 src/core/ext/transport/binder/client/endpoint_binder_pool.cc
 delete mode 100644 src/core/ext/transport/binder/client/endpoint_binder_pool.h
 delete mode 100644 src/core/ext/transport/binder/client/jni_utils.cc
 delete mode 100644 src/core/ext/transport/binder/client/jni_utils.h
 delete mode 100644 src/core/ext/transport/binder/client/security_policy_setting.cc
 delete mode 100644 src/core/ext/transport/binder/client/security_policy_setting.h
 delete mode 100644 src/core/ext/transport/binder/java/WORKSPACE
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
 delete mode 100644 src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
 delete mode 100644 src/core/ext/transport/binder/security_policy/binder_security_policy.cc
 delete mode 100644 src/core/ext/transport/binder/security_policy/security_policy.h
 delete mode 100644 src/core/ext/transport/binder/server/binder_server.cc
 delete mode 100644 src/core/ext/transport/binder/server/binder_server.h
 delete mode 100644 src/core/ext/transport/binder/server/binder_server_credentials.cc
 delete mode 100644 src/core/ext/transport/binder/transport/binder_stream.h
 delete mode 100644 src/core/ext/transport/binder/transport/binder_transport.cc
 delete mode 100644 src/core/ext/transport/binder/transport/binder_transport.h
 delete mode 100644 src/core/ext/transport/binder/utils/binder_auto_utils.h
 delete mode 100644 src/core/ext/transport/binder/utils/ndk_binder.cc
 delete mode 100644 src/core/ext/transport/binder/utils/ndk_binder.h
 delete mode 100644 src/core/ext/transport/binder/utils/transport_stream_receiver.h
 delete mode 100644 src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
 delete mode 100644 src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/binder.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/binder_android.cc
 delete mode 100644 src/core/ext/transport/binder/wire_format/binder_android.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/binder_constants.cc
 delete mode 100644 src/core/ext/transport/binder/wire_format/binder_constants.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/transaction.cc
 delete mode 100644 src/core/ext/transport/binder/wire_format/transaction.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/wire_reader.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
 delete mode 100644 src/core/ext/transport/binder/wire_format/wire_reader_impl.h
 delete mode 100644 src/core/ext/transport/binder/wire_format/wire_writer.cc
 delete mode 100644 src/core/ext/transport/binder/wire_format/wire_writer.h
 delete mode 100644 src/core/resolver/binder/README.md
 delete mode 100644 src/core/resolver/binder/binder_resolver.cc
 delete mode 100644 test/core/resolver/binder_resolver_test.cc
 delete mode 100644 test/core/transport/binder/BUILD
 delete mode 100644 test/core/transport/binder/binder_transport_test.cc
 delete mode 100644 test/core/transport/binder/end2end/BUILD
 delete mode 100644 test/core/transport/binder/end2end/binder_server_test.cc
 delete mode 100644 test/core/transport/binder/end2end/end2end_binder_transport_test.cc
 delete mode 100644 test/core/transport/binder/end2end/fake_binder.cc
 delete mode 100644 test/core/transport/binder/end2end/fake_binder.h
 delete mode 100644 test/core/transport/binder/end2end/fake_binder_test.cc
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/BUILD
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/client.proto
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/server.proto
 delete mode 100644 test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
 delete mode 100644 test/core/transport/binder/end2end/testing_channel_create.cc
 delete mode 100644 test/core/transport/binder/end2end/testing_channel_create.h
 delete mode 100644 test/core/transport/binder/endpoint_binder_pool_test.cc
 delete mode 100644 test/core/transport/binder/mock_objects.cc
 delete mode 100644 test/core/transport/binder/mock_objects.h
 delete mode 100644 test/core/transport/binder/transport_stream_receiver_test.cc
 delete mode 100644 test/core/transport/binder/wire_reader_test.cc
 delete mode 100644 test/core/transport/binder/wire_writer_test.cc

diff --git a/BUILD b/BUILD
index 6b48de532d5..bf0dbd6d81b 100644
--- a/BUILD
+++ b/BUILD
@@ -75,17 +75,6 @@ config_setting(
     flag_values = {":disable_grpc_rls": "true"},
 )
 
-# When gRPC is build as shared library, binder transport code might still
-# get included even when user's code does not depend on it. In that case
-# --define=grpc_no_binder=true can be used to disable binder transport
-# related code to reduce binary size.
-# For users using build system other than bazel, they can define
-# GRPC_NO_BINDER to achieve the same effect.
-config_setting(
-    name = "grpc_no_binder_define",
-    values = {"define": "grpc_no_binder=true"},
-)
-
 config_setting(
     name = "android",
     values = {"crosstool_top": "//external:android/crosstool"},
@@ -136,15 +125,6 @@ selects.config_setting_group(
     ],
 )
 
-selects.config_setting_group(
-    name = "grpc_no_binder",
-    match_any = [
-        ":grpc_no_binder_define",
-        # We do not need binder on ios.
-        ":ios",
-    ],
-)
-
 selects.config_setting_group(
     name = "grpc_no_rls",
     match_any = [
@@ -857,7 +837,6 @@ grpc_cc_library(
         "//src/core:grpc_lb_policy_weighted_target",
         "//src/core:grpc_channel_idle_filter",
         "//src/core:grpc_message_size_filter",
-        "//src/core:grpc_resolver_binder",
         "grpc_resolver_dns_ares",
         "grpc_resolver_fake",
         "//src/core:grpc_resolver_dns_native",
@@ -943,12 +922,6 @@ grpc_cc_library(
                 "grpc++_xds_server",
             ],
         },
-        {
-            "grpc_no_binder": [],
-            "//conditions:default": [
-                "grpc++_binder",
-            ],
-        },
     ],
     tags = ["nofixdeps"],
     visibility = ["@grpc:public"],
@@ -1079,112 +1052,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "grpc++_binder",
-    srcs = [
-        "//src/core:ext/transport/binder/client/binder_connector.cc",
-        "//src/core:ext/transport/binder/client/channel_create.cc",
-        "//src/core:ext/transport/binder/client/channel_create_impl.cc",
-        "//src/core:ext/transport/binder/client/connection_id_generator.cc",
-        "//src/core:ext/transport/binder/client/endpoint_binder_pool.cc",
-        "//src/core:ext/transport/binder/client/jni_utils.cc",
-        "//src/core:ext/transport/binder/client/security_policy_setting.cc",
-        "//src/core:ext/transport/binder/security_policy/binder_security_policy.cc",
-        "//src/core:ext/transport/binder/server/binder_server.cc",
-        "//src/core:ext/transport/binder/server/binder_server_credentials.cc",
-        "//src/core:ext/transport/binder/transport/binder_transport.cc",
-        "//src/core:ext/transport/binder/utils/ndk_binder.cc",
-        "//src/core:ext/transport/binder/utils/transport_stream_receiver_impl.cc",
-        "//src/core:ext/transport/binder/wire_format/binder_android.cc",
-        "//src/core:ext/transport/binder/wire_format/binder_constants.cc",
-        "//src/core:ext/transport/binder/wire_format/transaction.cc",
-        "//src/core:ext/transport/binder/wire_format/wire_reader_impl.cc",
-        "//src/core:ext/transport/binder/wire_format/wire_writer.cc",
-    ],
-    hdrs = [
-        "//src/core:ext/transport/binder/client/binder_connector.h",
-        "//src/core:ext/transport/binder/client/channel_create_impl.h",
-        "//src/core:ext/transport/binder/client/connection_id_generator.h",
-        "//src/core:ext/transport/binder/client/endpoint_binder_pool.h",
-        "//src/core:ext/transport/binder/client/jni_utils.h",
-        "//src/core:ext/transport/binder/client/security_policy_setting.h",
-        "//src/core:ext/transport/binder/server/binder_server.h",
-        "//src/core:ext/transport/binder/transport/binder_stream.h",
-        "//src/core:ext/transport/binder/transport/binder_transport.h",
-        "//src/core:ext/transport/binder/utils/binder_auto_utils.h",
-        "//src/core:ext/transport/binder/utils/ndk_binder.h",
-        "//src/core:ext/transport/binder/utils/transport_stream_receiver.h",
-        "//src/core:ext/transport/binder/utils/transport_stream_receiver_impl.h",
-        "//src/core:ext/transport/binder/wire_format/binder.h",
-        "//src/core:ext/transport/binder/wire_format/binder_android.h",
-        "//src/core:ext/transport/binder/wire_format/binder_constants.h",
-        "//src/core:ext/transport/binder/wire_format/transaction.h",
-        "//src/core:ext/transport/binder/wire_format/wire_reader.h",
-        "//src/core:ext/transport/binder/wire_format/wire_reader_impl.h",
-        "//src/core:ext/transport/binder/wire_format/wire_writer.h",
-    ],
-    defines = select({
-        "grpc_no_binder": ["GRPC_NO_BINDER"],
-        "//conditions:default": [],
-    }),
-    external_deps = [
-        "absl/base:core_headers",
-        "absl/cleanup",
-        "absl/container:flat_hash_map",
-        "absl/functional:any_invocable",
-        "absl/hash",
-        "absl/log:check",
-        "absl/log:log",
-        "absl/memory",
-        "absl/meta:type_traits",
-        "absl/status",
-        "absl/status:statusor",
-        "absl/strings",
-        "absl/synchronization",
-        "absl/time",
-        "absl/types:variant",
-    ],
-    language = "c++",
-    public_hdrs = [
-        "include/grpcpp/security/binder_security_policy.h",
-        "include/grpcpp/create_channel_binder.h",
-        "include/grpcpp/security/binder_credentials.h",
-    ],
-    tags = ["nofixdeps"],
-    deps = [
-        "channel",
-        "channel_create",
-        "config",
-        "debug_location",
-        "exec_ctx",
-        "gpr",
-        "gpr_platform",
-        "grpc",
-        "grpc++_base",
-        "grpc_base",
-        "grpc_client_channel",
-        "grpc_public_hdrs",
-        "orphanable",
-        "ref_counted_ptr",
-        "server",
-        "//src/core:arena",
-        "//src/core:channel_args",
-        "//src/core:channel_args_preconditioning",
-        "//src/core:channel_stack_type",
-        "//src/core:default_event_engine",
-        "//src/core:error_utils",
-        "//src/core:iomgr_fwd",
-        "//src/core:iomgr_port",
-        "//src/core:metadata_batch",
-        "//src/core:notification",
-        "//src/core:slice",
-        "//src/core:slice_refcount",
-        "//src/core:status_helper",
-        "//src/core:subchannel_connector",
-        "//src/core:transport_fwd",
-    ],
-)
-
 grpc_cc_library(
     name = "grpc++_xds_client",
     srcs = [
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84577907147..1c5396adf58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1167,9 +1167,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx bin_decoder_test)
   add_dependencies(buildtests_cxx bin_encoder_test)
   add_dependencies(buildtests_cxx binary_metadata_test)
-  add_dependencies(buildtests_cxx binder_resolver_test)
-  add_dependencies(buildtests_cxx binder_server_test)
-  add_dependencies(buildtests_cxx binder_transport_test)
   add_dependencies(buildtests_cxx bitset_test)
   add_dependencies(buildtests_cxx blackboard_test)
   add_dependencies(buildtests_cxx buffer_list_test)
@@ -1285,12 +1282,8 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx dump_args_test)
   add_dependencies(buildtests_cxx duplicate_header_bad_client_test)
   add_dependencies(buildtests_cxx empty_batch_test)
-  if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
-    add_dependencies(buildtests_cxx end2end_binder_transport_test)
-  endif()
   add_dependencies(buildtests_cxx end2end_test)
   add_dependencies(buildtests_cxx endpoint_addresses_test)
-  add_dependencies(buildtests_cxx endpoint_binder_pool_test)
   add_dependencies(buildtests_cxx endpoint_config_test)
   add_dependencies(buildtests_cxx endpoint_pair_test)
   add_dependencies(buildtests_cxx env_test)
@@ -1310,7 +1303,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx experiments_tag_test)
   add_dependencies(buildtests_cxx experiments_test)
   add_dependencies(buildtests_cxx factory_test)
-  add_dependencies(buildtests_cxx fake_binder_test)
   add_dependencies(buildtests_cxx fake_resolver_test)
   add_dependencies(buildtests_cxx fake_transport_security_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
@@ -1742,7 +1734,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx trailing_metadata_test)
   add_dependencies(buildtests_cxx transport_security_common_api_test)
   add_dependencies(buildtests_cxx transport_security_test)
-  add_dependencies(buildtests_cxx transport_stream_receiver_test)
   add_dependencies(buildtests_cxx try_join_test)
   add_dependencies(buildtests_cxx try_seq_metadata_test)
   add_dependencies(buildtests_cxx try_seq_test)
@@ -1767,8 +1758,6 @@ if(gRPC_BUILD_TESTS)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS)
     add_dependencies(buildtests_cxx windows_endpoint_test)
   endif()
-  add_dependencies(buildtests_cxx wire_reader_test)
-  add_dependencies(buildtests_cxx wire_writer_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx work_serializer_test)
   endif()
@@ -2758,7 +2747,6 @@ add_library(grpc
   src/core/load_balancing/xds/xds_wrr_locality.cc
   src/core/plugin_registry/grpc_plugin_registry.cc
   src/core/plugin_registry/grpc_plugin_registry_extra.cc
-  src/core/resolver/binder/binder_resolver.cc
   src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3525,7 +3513,6 @@ add_library(grpc_unsecure
   src/core/load_balancing/weighted_target/weighted_target.cc
   src/core/plugin_registry/grpc_plugin_registry.cc
   src/core/plugin_registry/grpc_plugin_registry_noextra.cc
-  src/core/resolver/binder/binder_resolver.cc
   src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -4399,24 +4386,6 @@ endif()
 endif()
 
 add_library(grpc++
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
   src/cpp/client/call_credentials.cc
   src/cpp/client/channel_cc.cc
   src/cpp/client/channel_credentials.cc
@@ -4598,7 +4567,6 @@ foreach(_hdr
   include/grpcpp/client_context.h
   include/grpcpp/completion_queue.h
   include/grpcpp/create_channel.h
-  include/grpcpp/create_channel_binder.h
   include/grpcpp/create_channel_posix.h
   include/grpcpp/ext/call_metric_recorder.h
   include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -4690,8 +4658,6 @@ foreach(_hdr
   include/grpcpp/security/auth_context.h
   include/grpcpp/security/auth_metadata_processor.h
   include/grpcpp/security/authorization_policy_provider.h
-  include/grpcpp/security/binder_credentials.h
-  include/grpcpp/security/binder_security_policy.h
   include/grpcpp/security/credentials.h
   include/grpcpp/security/server_credentials.h
   include/grpcpp/security/tls_certificate_provider.h
@@ -8381,220 +8347,6 @@ target_link_libraries(binary_metadata_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(binder_resolver_test
-  test/core/resolver/binder_resolver_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(binder_resolver_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(binder_resolver_test PUBLIC cxx_std_14)
-target_include_directories(binder_resolver_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(binder_resolver_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  grpc_test_util
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(binder_server_test
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
-  test/core/transport/binder/end2end/binder_server_test.cc
-  test/core/transport/binder/end2end/fake_binder.cc
-  test/cpp/end2end/test_service_impl.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(binder_server_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-      "GRPCXX_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(binder_server_test PUBLIC cxx_std_14)
-target_include_directories(binder_server_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(binder_server_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  grpc++_test_util
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(binder_transport_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/binder_transport_test.cc
-  test/core/transport/binder/mock_objects.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(binder_transport_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(binder_transport_test PUBLIC cxx_std_14)
-target_include_directories(binder_transport_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(binder_transport_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -13511,70 +13263,6 @@ target_link_libraries(empty_batch_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
-
-  add_executable(end2end_binder_transport_test
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo.grpc.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/echo_messages.grpc.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/simple_messages.grpc.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.cc
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.pb.h
-    ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/xds/v3/orca_load_report.grpc.pb.h
-    test/core/transport/binder/end2end/end2end_binder_transport_test.cc
-    test/core/transport/binder/end2end/fake_binder.cc
-    test/core/transport/binder/end2end/testing_channel_create.cc
-    test/cpp/end2end/test_service_impl.cc
-  )
-  if(WIN32 AND MSVC)
-    if(BUILD_SHARED_LIBS)
-      target_compile_definitions(end2end_binder_transport_test
-      PRIVATE
-        "GPR_DLL_IMPORTS"
-        "GRPC_DLL_IMPORTS"
-        "GRPCXX_DLL_IMPORTS"
-      )
-    endif()
-  endif()
-  target_compile_features(end2end_binder_transport_test PUBLIC cxx_std_14)
-  target_include_directories(end2end_binder_transport_test
-    PRIVATE
-      ${CMAKE_CURRENT_SOURCE_DIR}
-      ${CMAKE_CURRENT_SOURCE_DIR}/include
-      ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-      ${_gRPC_RE2_INCLUDE_DIR}
-      ${_gRPC_SSL_INCLUDE_DIR}
-      ${_gRPC_UPB_GENERATED_DIR}
-      ${_gRPC_UPB_GRPC_GENERATED_DIR}
-      ${_gRPC_UPB_INCLUDE_DIR}
-      ${_gRPC_XXHASH_INCLUDE_DIR}
-      ${_gRPC_ZLIB_INCLUDE_DIR}
-      third_party/googletest/googletest/include
-      third_party/googletest/googletest
-      third_party/googletest/googlemock/include
-      third_party/googletest/googlemock
-      ${_gRPC_PROTO_GENS_DIR}
-  )
-
-  target_link_libraries(end2end_binder_transport_test
-    ${_gRPC_ALLTARGETS_LIBRARIES}
-    gtest
-    grpc++_test_util
-  )
-
-
-endif()
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -13682,117 +13370,6 @@ target_link_libraries(endpoint_addresses_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(endpoint_binder_pool_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/endpoint_binder_pool_test.cc
-  test/core/transport/binder/mock_objects.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(endpoint_binder_pool_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(endpoint_binder_pool_test PUBLIC cxx_std_14)
-target_include_directories(endpoint_binder_pool_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(endpoint_binder_pool_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -14538,117 +14115,6 @@ target_link_libraries(factory_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(fake_binder_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/end2end/fake_binder.cc
-  test/core/transport/binder/end2end/fake_binder_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(fake_binder_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(fake_binder_test PUBLIC cxx_std_14)
-target_include_directories(fake_binder_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(fake_binder_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -32793,116 +32259,6 @@ target_link_libraries(transport_security_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(transport_stream_receiver_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/transport_stream_receiver_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(transport_stream_receiver_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(transport_stream_receiver_test PUBLIC cxx_std_14)
-target_include_directories(transport_stream_receiver_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(transport_stream_receiver_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -33680,228 +33036,6 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX OR _gRPC_PLATFORM_WINDOWS)
 
 
 endif()
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(wire_reader_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/mock_objects.cc
-  test/core/transport/binder/wire_reader_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(wire_reader_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(wire_reader_test PUBLIC cxx_std_14)
-target_include_directories(wire_reader_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(wire_reader_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(wire_writer_test
-  src/core/ext/transport/binder/client/binder_connector.cc
-  src/core/ext/transport/binder/client/channel_create.cc
-  src/core/ext/transport/binder/client/channel_create_impl.cc
-  src/core/ext/transport/binder/client/connection_id_generator.cc
-  src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  src/core/ext/transport/binder/client/jni_utils.cc
-  src/core/ext/transport/binder/client/security_policy_setting.cc
-  src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  src/core/ext/transport/binder/server/binder_server.cc
-  src/core/ext/transport/binder/server/binder_server_credentials.cc
-  src/core/ext/transport/binder/transport/binder_transport.cc
-  src/core/ext/transport/binder/utils/ndk_binder.cc
-  src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  src/core/ext/transport/binder/wire_format/binder_android.cc
-  src/core/ext/transport/binder/wire_format/binder_constants.cc
-  src/core/ext/transport/binder/wire_format/transaction.cc
-  src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  src/core/ext/transport/binder/wire_format/wire_writer.cc
-  src/cpp/client/call_credentials.cc
-  src/cpp/client/channel_cc.cc
-  src/cpp/client/channel_credentials.cc
-  src/cpp/client/client_callback.cc
-  src/cpp/client/client_context.cc
-  src/cpp/client/client_interceptor.cc
-  src/cpp/client/client_stats_interceptor.cc
-  src/cpp/client/create_channel.cc
-  src/cpp/client/create_channel_internal.cc
-  src/cpp/client/create_channel_posix.cc
-  src/cpp/client/global_callback_hook.cc
-  src/cpp/client/insecure_credentials.cc
-  src/cpp/client/secure_credentials.cc
-  src/cpp/common/alarm.cc
-  src/cpp/common/auth_property_iterator.cc
-  src/cpp/common/channel_arguments.cc
-  src/cpp/common/completion_queue_cc.cc
-  src/cpp/common/resource_quota_cc.cc
-  src/cpp/common/rpc_method.cc
-  src/cpp/common/secure_auth_context.cc
-  src/cpp/common/secure_create_auth_context.cc
-  src/cpp/common/tls_certificate_provider.cc
-  src/cpp/common/tls_certificate_verifier.cc
-  src/cpp/common/tls_credentials_options.cc
-  src/cpp/common/validate_service_config.cc
-  src/cpp/common/version_cc.cc
-  src/cpp/server/async_generic_service.cc
-  src/cpp/server/backend_metric_recorder.cc
-  src/cpp/server/channel_argument_option.cc
-  src/cpp/server/create_default_thread_pool.cc
-  src/cpp/server/external_connection_acceptor_impl.cc
-  src/cpp/server/health/default_health_check_service.cc
-  src/cpp/server/health/health_check_service.cc
-  src/cpp/server/health/health_check_service_server_builder_option.cc
-  src/cpp/server/insecure_server_credentials.cc
-  src/cpp/server/secure_server_credentials.cc
-  src/cpp/server/server_builder.cc
-  src/cpp/server/server_callback.cc
-  src/cpp/server/server_cc.cc
-  src/cpp/server/server_context.cc
-  src/cpp/server/server_credentials.cc
-  src/cpp/server/server_posix.cc
-  src/cpp/thread_manager/thread_manager.cc
-  src/cpp/util/byte_buffer_cc.cc
-  src/cpp/util/status.cc
-  src/cpp/util/string_ref.cc
-  src/cpp/util/time_cc.cc
-  test/core/transport/binder/mock_objects.cc
-  test/core/transport/binder/wire_writer_test.cc
-)
-if(WIN32 AND MSVC)
-  if(BUILD_SHARED_LIBS)
-    target_compile_definitions(wire_writer_test
-    PRIVATE
-      "GPR_DLL_IMPORTS"
-      "GRPC_DLL_IMPORTS"
-    )
-  endif()
-endif()
-target_compile_features(wire_writer_test PUBLIC cxx_std_14)
-target_include_directories(wire_writer_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(wire_writer_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::absl_check
-  absl::absl_log
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
diff --git a/Makefile b/Makefile
index 374780ac078..83b4e0774d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1358,7 +1358,6 @@ LIBGRPC_SRC = \
     src/core/load_balancing/xds/xds_wrr_locality.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-    src/core/resolver/binder/binder_resolver.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
diff --git a/Package.swift b/Package.swift
index 9194101da71..a87a66da834 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1709,7 +1709,6 @@ let package = Package(
         "src/core/load_balancing/xds/xds_wrr_locality.cc",
         "src/core/plugin_registry/grpc_plugin_registry.cc",
         "src/core/plugin_registry/grpc_plugin_registry_extra.cc",
-        "src/core/resolver/binder/binder_resolver.cc",
         "src/core/resolver/dns/c_ares/dns_resolver_ares.cc",
         "src/core/resolver/dns/c_ares/dns_resolver_ares.h",
         "src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h",
diff --git a/WORKSPACE b/WORKSPACE
index 675233b2eb1..f3188fcaeaf 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -56,16 +56,6 @@ android_ndk_repository(name = "androidndk")
 # here, because the toolchain rule fails when $ANDROID_NDK_HOME is not set.
 # Use `--extra_toolchains=@androidndk//:all` to manually register it when building for Android.
 
-# Prevents bazel's '...' expansion from including the following folder.
-# This is required because the BUILD file in the following folder
-# will trigger bazel failure when Android SDK is not configured.
-# The targets in the following folder need to be included in APK and will
-# be invoked by binder transport implementation through JNI.
-local_repository(
-    name = "binder_transport_android_helper",
-    path = "src/core/ext/transport/binder/java",
-)
-
 # Prevents bazel's '...' expansion from including the following folder.
 # This is required to avoid triggering "Unable to find package for @rules_fuzzing//fuzzing:cc_defs.bzl"
 # error.
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index e9fda988353..c3b23bf49eb 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -1965,7 +1965,6 @@ libs:
   - src/core/load_balancing/xds/xds_wrr_locality.cc
   - src/core/plugin_registry/grpc_plugin_registry.cc
   - src/core/plugin_registry/grpc_plugin_registry_extra.cc
-  - src/core/resolver/binder/binder_resolver.cc
   - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3084,7 +3083,6 @@ libs:
   - src/core/load_balancing/weighted_target/weighted_target.cc
   - src/core/plugin_registry/grpc_plugin_registry.cc
   - src/core/plugin_registry/grpc_plugin_registry_noextra.cc
-  - src/core/resolver/binder/binder_resolver.cc
   - src/core/resolver/dns/c_ares/dns_resolver_ares.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc
   - src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc
@@ -3770,7 +3768,6 @@ libs:
   - include/grpcpp/client_context.h
   - include/grpcpp/completion_queue.h
   - include/grpcpp/create_channel.h
-  - include/grpcpp/create_channel_binder.h
   - include/grpcpp/create_channel_posix.h
   - include/grpcpp/ext/call_metric_recorder.h
   - include/grpcpp/ext/health_check_service_server_builder_option.h
@@ -3862,8 +3859,6 @@ libs:
   - include/grpcpp/security/auth_context.h
   - include/grpcpp/security/auth_metadata_processor.h
   - include/grpcpp/security/authorization_policy_provider.h
-  - include/grpcpp/security/binder_credentials.h
-  - include/grpcpp/security/binder_security_policy.h
   - include/grpcpp/security/credentials.h
   - include/grpcpp/security/server_credentials.h
   - include/grpcpp/security/tls_certificate_provider.h
@@ -3902,26 +3897,6 @@ libs:
   - include/grpcpp/version_info.h
   - include/grpcpp/xds_server_builder.h
   headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
   - src/core/xds/grpc/xds_enabled_server.h
   - src/cpp/client/client_stats_interceptor.h
   - src/cpp/client/create_channel_internal.h
@@ -3935,24 +3910,6 @@ libs:
   - src/cpp/server/thread_pool_interface.h
   - src/cpp/thread_manager/thread_manager.h
   src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
   - src/cpp/client/call_credentials.cc
   - src/cpp/client/channel_cc.cc
   - src/cpp/client/channel_credentials.cc
@@ -6141,146 +6098,6 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
-- name: binder_resolver_test
-  gtest: true
-  build: test
-  language: c++
-  headers: []
-  src:
-  - test/core/resolver/binder_resolver_test.cc
-  deps:
-  - gtest
-  - grpc_test_util
-- name: binder_server_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - test/core/transport/binder/end2end/fake_binder.h
-  - test/cpp/end2end/test_service_impl.h
-  src:
-  - src/proto/grpc/testing/echo.proto
-  - src/proto/grpc/testing/echo_messages.proto
-  - src/proto/grpc/testing/simple_messages.proto
-  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
-  - test/core/transport/binder/end2end/binder_server_test.cc
-  - test/core/transport/binder/end2end/fake_binder.cc
-  - test/cpp/end2end/test_service_impl.cc
-  deps:
-  - gtest
-  - grpc++_test_util
-- name: binder_transport_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/binder_transport_test.cc
-  - test/core/transport/binder/mock_objects.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: bitset_test
   gtest: true
   build: test
@@ -9654,30 +9471,6 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
-- name: end2end_binder_transport_test
-  gtest: true
-  build: test
-  run: false
-  language: c++
-  headers:
-  - test/core/transport/binder/end2end/fake_binder.h
-  - test/core/transport/binder/end2end/testing_channel_create.h
-  - test/cpp/end2end/test_service_impl.h
-  src:
-  - src/proto/grpc/testing/echo.proto
-  - src/proto/grpc/testing/echo_messages.proto
-  - src/proto/grpc/testing/simple_messages.proto
-  - src/proto/grpc/testing/xds/v3/orca_load_report.proto
-  - test/core/transport/binder/end2end/end2end_binder_transport_test.cc
-  - test/core/transport/binder/end2end/fake_binder.cc
-  - test/core/transport/binder/end2end/testing_channel_create.cc
-  - test/cpp/end2end/test_service_impl.cc
-  deps:
-  - gtest
-  - grpc++_test_util
-  platforms:
-  - linux
-  - posix
 - name: end2end_test
   gtest: true
   build: test
@@ -9709,118 +9502,6 @@ targets:
   - gtest
   - grpc_test_util
   uses_polling: false
-- name: endpoint_binder_pool_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/endpoint_binder_pool_test.cc
-  - test/core/transport/binder/mock_objects.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: endpoint_config_test
   gtest: true
   build: test
@@ -10185,118 +9866,6 @@ targets:
   deps:
   - gtest
   - grpc_test_util_unsecure
-- name: fake_binder_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/end2end/fake_binder.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/end2end/fake_binder.cc
-  - test/core/transport/binder/end2end/fake_binder_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: fake_resolver_test
   gtest: true
   build: test
@@ -20658,116 +20227,6 @@ targets:
   deps:
   - gtest
   - grpc_test_util
-- name: transport_stream_receiver_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/transport_stream_receiver_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: try_join_test
   gtest: true
   build: test
@@ -21077,230 +20536,6 @@ targets:
   - posix
   - windows
   uses_polling: false
-- name: wire_reader_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/mock_objects.cc
-  - test/core/transport/binder/wire_reader_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
-- name: wire_writer_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/binder/client/binder_connector.h
-  - src/core/ext/transport/binder/client/channel_create_impl.h
-  - src/core/ext/transport/binder/client/connection_id_generator.h
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.h
-  - src/core/ext/transport/binder/client/jni_utils.h
-  - src/core/ext/transport/binder/client/security_policy_setting.h
-  - src/core/ext/transport/binder/server/binder_server.h
-  - src/core/ext/transport/binder/transport/binder_stream.h
-  - src/core/ext/transport/binder/transport/binder_transport.h
-  - src/core/ext/transport/binder/utils/binder_auto_utils.h
-  - src/core/ext/transport/binder/utils/ndk_binder.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver.h
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
-  - src/core/ext/transport/binder/wire_format/binder.h
-  - src/core/ext/transport/binder/wire_format/binder_android.h
-  - src/core/ext/transport/binder/wire_format/binder_constants.h
-  - src/core/ext/transport/binder/wire_format/transaction.h
-  - src/core/ext/transport/binder/wire_format/wire_reader.h
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.h
-  - src/core/ext/transport/binder/wire_format/wire_writer.h
-  - src/cpp/client/client_stats_interceptor.h
-  - src/cpp/client/create_channel_internal.h
-  - src/cpp/client/secure_credentials.h
-  - src/cpp/common/secure_auth_context.h
-  - src/cpp/server/backend_metric_recorder.h
-  - src/cpp/server/dynamic_thread_pool.h
-  - src/cpp/server/external_connection_acceptor_impl.h
-  - src/cpp/server/health/default_health_check_service.h
-  - src/cpp/server/secure_server_credentials.h
-  - src/cpp/server/thread_pool_interface.h
-  - src/cpp/thread_manager/thread_manager.h
-  - test/core/transport/binder/mock_objects.h
-  src:
-  - src/core/ext/transport/binder/client/binder_connector.cc
-  - src/core/ext/transport/binder/client/channel_create.cc
-  - src/core/ext/transport/binder/client/channel_create_impl.cc
-  - src/core/ext/transport/binder/client/connection_id_generator.cc
-  - src/core/ext/transport/binder/client/endpoint_binder_pool.cc
-  - src/core/ext/transport/binder/client/jni_utils.cc
-  - src/core/ext/transport/binder/client/security_policy_setting.cc
-  - src/core/ext/transport/binder/security_policy/binder_security_policy.cc
-  - src/core/ext/transport/binder/server/binder_server.cc
-  - src/core/ext/transport/binder/server/binder_server_credentials.cc
-  - src/core/ext/transport/binder/transport/binder_transport.cc
-  - src/core/ext/transport/binder/utils/ndk_binder.cc
-  - src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
-  - src/core/ext/transport/binder/wire_format/binder_android.cc
-  - src/core/ext/transport/binder/wire_format/binder_constants.cc
-  - src/core/ext/transport/binder/wire_format/transaction.cc
-  - src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
-  - src/core/ext/transport/binder/wire_format/wire_writer.cc
-  - src/cpp/client/call_credentials.cc
-  - src/cpp/client/channel_cc.cc
-  - src/cpp/client/channel_credentials.cc
-  - src/cpp/client/client_callback.cc
-  - src/cpp/client/client_context.cc
-  - src/cpp/client/client_interceptor.cc
-  - src/cpp/client/client_stats_interceptor.cc
-  - src/cpp/client/create_channel.cc
-  - src/cpp/client/create_channel_internal.cc
-  - src/cpp/client/create_channel_posix.cc
-  - src/cpp/client/global_callback_hook.cc
-  - src/cpp/client/insecure_credentials.cc
-  - src/cpp/client/secure_credentials.cc
-  - src/cpp/common/alarm.cc
-  - src/cpp/common/auth_property_iterator.cc
-  - src/cpp/common/channel_arguments.cc
-  - src/cpp/common/completion_queue_cc.cc
-  - src/cpp/common/resource_quota_cc.cc
-  - src/cpp/common/rpc_method.cc
-  - src/cpp/common/secure_auth_context.cc
-  - src/cpp/common/secure_create_auth_context.cc
-  - src/cpp/common/tls_certificate_provider.cc
-  - src/cpp/common/tls_certificate_verifier.cc
-  - src/cpp/common/tls_credentials_options.cc
-  - src/cpp/common/validate_service_config.cc
-  - src/cpp/common/version_cc.cc
-  - src/cpp/server/async_generic_service.cc
-  - src/cpp/server/backend_metric_recorder.cc
-  - src/cpp/server/channel_argument_option.cc
-  - src/cpp/server/create_default_thread_pool.cc
-  - src/cpp/server/external_connection_acceptor_impl.cc
-  - src/cpp/server/health/default_health_check_service.cc
-  - src/cpp/server/health/health_check_service.cc
-  - src/cpp/server/health/health_check_service_server_builder_option.cc
-  - src/cpp/server/insecure_server_credentials.cc
-  - src/cpp/server/secure_server_credentials.cc
-  - src/cpp/server/server_builder.cc
-  - src/cpp/server/server_callback.cc
-  - src/cpp/server/server_cc.cc
-  - src/cpp/server/server_context.cc
-  - src/cpp/server/server_credentials.cc
-  - src/cpp/server/server_posix.cc
-  - src/cpp/thread_manager/thread_manager.cc
-  - src/cpp/util/byte_buffer_cc.cc
-  - src/cpp/util/status.cc
-  - src/cpp/util/string_ref.cc
-  - src/cpp/util/time_cc.cc
-  - test/core/transport/binder/mock_objects.cc
-  - test/core/transport/binder/wire_writer_test.cc
-  deps:
-  - gtest
-  - absl/log:absl_check
-  - absl/log:absl_log
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: work_serializer_test
   gtest: true
   build: test
diff --git a/config.m4 b/config.m4
index d61d5ceb2bc..d93a73252c7 100644
--- a/config.m4
+++ b/config.m4
@@ -733,7 +733,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/load_balancing/xds/xds_wrr_locality.cc \
     src/core/plugin_registry/grpc_plugin_registry.cc \
     src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-    src/core/resolver/binder/binder_resolver.cc \
     src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc \
     src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc \
@@ -1606,7 +1605,6 @@ if test "$PHP_GRPC" != "no"; then
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/load_balancing/xds)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/binder)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/c_ares)
   PHP_ADD_BUILD_DIR($ext_builddir/src/core/resolver/dns/event_engine)
diff --git a/config.w32 b/config.w32
index e2fdf24e6db..2cda7c51ba4 100644
--- a/config.w32
+++ b/config.w32
@@ -698,7 +698,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\load_balancing\\xds\\xds_wrr_locality.cc " +
     "src\\core\\plugin_registry\\grpc_plugin_registry.cc " +
     "src\\core\\plugin_registry\\grpc_plugin_registry_extra.cc " +
-    "src\\core\\resolver\\binder\\binder_resolver.cc " +
     "src\\core\\resolver\\dns\\c_ares\\dns_resolver_ares.cc " +
     "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_posix.cc " +
     "src\\core\\resolver\\dns\\c_ares\\grpc_ares_ev_driver_windows.cc " +
@@ -1748,7 +1747,6 @@ if (PHP_GRPC != "no") {
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\load_balancing\\xds");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\plugin_registry");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\binder");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\c_ares");
   FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\resolver\\dns\\event_engine");
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 855d83c5002..961c8f0a23b 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -97,7 +97,6 @@ Pod::Spec.new do |s|
                       'include/grpcpp/client_context.h',
                       'include/grpcpp/completion_queue.h',
                       'include/grpcpp/create_channel.h',
-                      'include/grpcpp/create_channel_binder.h',
                       'include/grpcpp/create_channel_posix.h',
                       'include/grpcpp/ext/call_metric_recorder.h',
                       'include/grpcpp/ext/health_check_service_server_builder_option.h',
@@ -185,8 +184,6 @@ Pod::Spec.new do |s|
                       'include/grpcpp/security/auth_context.h',
                       'include/grpcpp/security/auth_metadata_processor.h',
                       'include/grpcpp/security/authorization_policy_provider.h',
-                      'include/grpcpp/security/binder_credentials.h',
-                      'include/grpcpp/security/binder_security_policy.h',
                       'include/grpcpp/security/credentials.h',
                       'include/grpcpp/security/server_credentials.h',
                       'include/grpcpp/security/tls_certificate_provider.h',
@@ -313,44 +310,6 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/rbac/rbac_service_config_parser.h',
                       'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                       'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
-                      'src/core/ext/transport/binder/client/binder_connector.cc',
-                      'src/core/ext/transport/binder/client/binder_connector.h',
-                      'src/core/ext/transport/binder/client/channel_create.cc',
-                      'src/core/ext/transport/binder/client/channel_create_impl.cc',
-                      'src/core/ext/transport/binder/client/channel_create_impl.h',
-                      'src/core/ext/transport/binder/client/connection_id_generator.cc',
-                      'src/core/ext/transport/binder/client/connection_id_generator.h',
-                      'src/core/ext/transport/binder/client/endpoint_binder_pool.cc',
-                      'src/core/ext/transport/binder/client/endpoint_binder_pool.h',
-                      'src/core/ext/transport/binder/client/jni_utils.cc',
-                      'src/core/ext/transport/binder/client/jni_utils.h',
-                      'src/core/ext/transport/binder/client/security_policy_setting.cc',
-                      'src/core/ext/transport/binder/client/security_policy_setting.h',
-                      'src/core/ext/transport/binder/security_policy/binder_security_policy.cc',
-                      'src/core/ext/transport/binder/server/binder_server.cc',
-                      'src/core/ext/transport/binder/server/binder_server.h',
-                      'src/core/ext/transport/binder/server/binder_server_credentials.cc',
-                      'src/core/ext/transport/binder/transport/binder_stream.h',
-                      'src/core/ext/transport/binder/transport/binder_transport.cc',
-                      'src/core/ext/transport/binder/transport/binder_transport.h',
-                      'src/core/ext/transport/binder/utils/binder_auto_utils.h',
-                      'src/core/ext/transport/binder/utils/ndk_binder.cc',
-                      'src/core/ext/transport/binder/utils/ndk_binder.h',
-                      'src/core/ext/transport/binder/utils/transport_stream_receiver.h',
-                      'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc',
-                      'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h',
-                      'src/core/ext/transport/binder/wire_format/binder.h',
-                      'src/core/ext/transport/binder/wire_format/binder_android.cc',
-                      'src/core/ext/transport/binder/wire_format/binder_android.h',
-                      'src/core/ext/transport/binder/wire_format/binder_constants.cc',
-                      'src/core/ext/transport/binder/wire_format/binder_constants.h',
-                      'src/core/ext/transport/binder/wire_format/transaction.cc',
-                      'src/core/ext/transport/binder/wire_format/transaction.h',
-                      'src/core/ext/transport/binder/wire_format/wire_reader.h',
-                      'src/core/ext/transport/binder/wire_format/wire_reader_impl.cc',
-                      'src/core/ext/transport/binder/wire_format/wire_reader_impl.h',
-                      'src/core/ext/transport/binder/wire_format/wire_writer.cc',
-                      'src/core/ext/transport/binder/wire_format/wire_writer.h',
                       'src/core/ext/transport/chttp2/alpn/alpn.h',
                       'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                       'src/core/ext/transport/chttp2/server/chttp2_server.h',
@@ -1640,26 +1599,6 @@ Pod::Spec.new do |s|
                               'src/core/ext/filters/rbac/rbac_service_config_parser.h',
                               'src/core/ext/filters/stateful_session/stateful_session_filter.h',
                               'src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h',
-                              'src/core/ext/transport/binder/client/binder_connector.h',
-                              'src/core/ext/transport/binder/client/channel_create_impl.h',
-                              'src/core/ext/transport/binder/client/connection_id_generator.h',
-                              'src/core/ext/transport/binder/client/endpoint_binder_pool.h',
-                              'src/core/ext/transport/binder/client/jni_utils.h',
-                              'src/core/ext/transport/binder/client/security_policy_setting.h',
-                              'src/core/ext/transport/binder/server/binder_server.h',
-                              'src/core/ext/transport/binder/transport/binder_stream.h',
-                              'src/core/ext/transport/binder/transport/binder_transport.h',
-                              'src/core/ext/transport/binder/utils/binder_auto_utils.h',
-                              'src/core/ext/transport/binder/utils/ndk_binder.h',
-                              'src/core/ext/transport/binder/utils/transport_stream_receiver.h',
-                              'src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h',
-                              'src/core/ext/transport/binder/wire_format/binder.h',
-                              'src/core/ext/transport/binder/wire_format/binder_android.h',
-                              'src/core/ext/transport/binder/wire_format/binder_constants.h',
-                              'src/core/ext/transport/binder/wire_format/transaction.h',
-                              'src/core/ext/transport/binder/wire_format/wire_reader.h',
-                              'src/core/ext/transport/binder/wire_format/wire_reader_impl.h',
-                              'src/core/ext/transport/binder/wire_format/wire_writer.h',
                               'src/core/ext/transport/chttp2/alpn/alpn.h',
                               'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                               'src/core/ext/transport/chttp2/server/chttp2_server.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 3b4c352f0ee..5951fc59136 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1825,7 +1825,6 @@ Pod::Spec.new do |s|
                       'src/core/load_balancing/xds/xds_wrr_locality.cc',
                       'src/core/plugin_registry/grpc_plugin_registry.cc',
                       'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
-                      'src/core/resolver/binder/binder_resolver.cc',
                       'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
                       'src/core/resolver/dns/c_ares/dns_resolver_ares.h',
                       'src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 1206ce25b71..752aeb2c6a4 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1711,7 +1711,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/load_balancing/xds/xds_wrr_locality.cc )
   s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )
   s.files += %w( src/core/plugin_registry/grpc_plugin_registry_extra.cc )
-  s.files += %w( src/core/resolver/binder/binder_resolver.cc )
   s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.cc )
   s.files += %w( src/core/resolver/dns/c_ares/dns_resolver_ares.h )
   s.files += %w( src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h )
diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h
index 5fb7426af2b..8f0d1fa933c 100644
--- a/include/grpc/support/port_platform.h
+++ b/include/grpc/support/port_platform.h
@@ -172,7 +172,6 @@
 #if __ANDROID_API__ < 21
 #error "Requires Android API v21 and above"
 #endif
-#define GPR_SUPPORT_BINDER_TRANSPORT 1
 // TODO(apolcyn): re-evaluate support for c-ares
 // on android after upgrading our c-ares dependency.
 // See https://github.com/grpc/grpc/issues/18038.
diff --git a/include/grpcpp/create_channel_binder.h b/include/grpcpp/create_channel_binder.h
deleted file mode 100644
index f19792a184a..00000000000
--- a/include/grpcpp/create_channel_binder.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPCPP_CREATE_CHANNEL_BINDER_H
-#define GRPCPP_CREATE_CHANNEL_BINDER_H
-
-#include <grpc/support/port_platform.h>
-
-#ifdef GPR_ANDROID
-
-#include <grpcpp/channel.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <grpcpp/support/channel_arguments.h>
-#include <jni.h>
-
-#include <memory>
-
-#include "absl/strings/string_view.h"
-
-namespace grpc {
-namespace experimental {
-
-/// EXPERIMENTAL Create a new \a Channel based on binder transport. The package
-/// name and class name will be used identify the specific application component
-/// to connect to.
-///
-/// \param jni_env_void Pointer to a JNIEnv structure
-/// \param context The context that we will use to invoke \a bindService See
-/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int)
-/// for detail.
-/// \param package_name Package name of the component to be connected to
-/// \param class_name Class name of the component to be connected to
-/// \param security_policy Used for checking if remote component is allowed to
-/// connect
-std::shared_ptr<grpc::Channel> CreateBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view package_name,
-    absl::string_view class_name,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy);
-
-/// EXPERIMENTAL Create a new \a Channel based on binder transport. The package
-/// name and class name will be used identify the specific application component
-/// to connect to.
-///
-/// \param jni_env_void Pointer to a JNIEnv structure
-/// \param context The context that we will use to invoke \a bindService See
-/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int)
-/// for detail.
-/// \param package_name Package name of the component to be connected to
-/// \param class_name Class name of the component to be connected to
-/// \param security_policy Used for checking if remote component is allowed to
-/// connect
-/// \param args Options for channel creation.
-std::shared_ptr<grpc::Channel> CreateCustomBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view package_name,
-    absl::string_view class_name,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy,
-    const ChannelArguments& args);
-
-/// EXPERIMENTAL Create a new \a Channel based on binder transport.
-///
-/// \param jni_env_void Pointer to a JNIEnv structure
-/// \param context The context that we will use to invoke \a bindService See
-/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int)
-/// for detail.
-/// \param uri An URI that can be parsed as an `Intent` with
-/// https://developer.android.com/reference/android/content/Intent#parseUri(java.lang.String,%20int)
-/// \param security_policy Used for checking if remote component is allowed to
-/// connect
-std::shared_ptr<grpc::Channel> CreateBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view uri,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy);
-
-/// EXPERIMENTAL Create a new \a Channel based on binder transport.
-///
-/// \param jni_env_void Pointer to a JNIEnv structure
-/// \param context The context that we will use to invoke \a bindService See
-/// https://developer.android.com/reference/android/content/Context#bindService(android.content.Intent,%20android.content.ServiceConnection,%20int)
-/// for detail.
-/// \param uri An URI that can be parsed as an `Intent` with
-/// https://developer.android.com/reference/android/content/Intent#parseUri(java.lang.String,%20int)
-/// \param security_policy Used for checking if remote component is allowed to
-/// connect
-/// \param args Options for channel creation.
-std::shared_ptr<grpc::Channel> CreateCustomBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view uri,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy,
-    const ChannelArguments& args);
-
-/// EXPERIMENTAL Finds internal binder transport Java code. To create channels
-/// in threads created in native code, it is required to call this function
-/// once beforehand in a thread that is not created in native code.
-/// See
-/// https://developer.android.com/training/articles/perf-jni#faq:-why-didnt-findclass-find-my-class
-/// for details of this limitation.
-/// Returns true when the initialization is successful.
-bool InitializeBinderChannelJavaClass(void* jni_env_void);
-
-/// EXPERIMENTAL Alternative version of `InitializeBinderChannelJavaClass(void*
-/// jni_env_void)`. This version used a user-specified function to find the
-/// required internal Java class. When a class is found, the `class_finder`
-/// function should return a local reference to the class (jclass type). The
-/// returned jclass will then be used to create global reference for gRPC to use
-/// it later. After that, gRPC will DeleteLocalRef the returned local reference.
-bool InitializeBinderChannelJavaClass(
-    void* jni_env_void, std::function<void*(std::string)> class_finder);
-
-}  // namespace experimental
-}  // namespace grpc
-
-#endif
-
-#endif  // GRPCPP_CREATE_CHANNEL_BINDER_H
diff --git a/include/grpcpp/security/binder_credentials.h b/include/grpcpp/security/binder_credentials.h
deleted file mode 100644
index 3c38b5129d5..00000000000
--- a/include/grpcpp/security/binder_credentials.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPCPP_SECURITY_BINDER_CREDENTIALS_H
-#define GRPCPP_SECURITY_BINDER_CREDENTIALS_H
-
-#include <grpcpp/security/binder_security_policy.h>
-#include <grpcpp/security/server_credentials.h>
-
-#include <memory>
-
-namespace grpc {
-
-class ChannelCredentials;
-
-namespace experimental {
-
-/// EXPERIMENTAL Builds Binder ServerCredentials.
-///
-/// This should be used along with `binder:` URI scheme. The path in the URI can
-/// later be used to access the server's endpoint binder.
-/// Note that calling \a ServerBuilder::AddListeningPort() with Binder
-/// ServerCredentials in a non-supported environment will make the subsequent
-/// call to \a ServerBuilder::BuildAndStart() return a null pointer.
-std::shared_ptr<grpc::ServerCredentials> BinderServerCredentials(
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy);
-
-}  // namespace experimental
-}  // namespace grpc
-
-#endif  // GRPCPP_SECURITY_BINDER_CREDENTIALS_H
diff --git a/include/grpcpp/security/binder_security_policy.h b/include/grpcpp/security/binder_security_policy.h
deleted file mode 100644
index e1c951fc660..00000000000
--- a/include/grpcpp/security/binder_security_policy.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
-#define GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
-
-#include <memory>
-
-#ifdef GPR_ANDROID
-
-#include <jni.h>
-
-#endif
-
-namespace grpc {
-namespace experimental {
-namespace binder {
-
-// EXPERIMENTAL Determinines if a connection is allowed to be
-// established on Android. See https://source.android.com/security/app-sandbox
-// for more info about UID.
-class SecurityPolicy {
- public:
-  virtual ~SecurityPolicy() = default;
-  // Returns true if the UID is authorized to connect.
-  // Must return the same value for the same inputs so callers can safely cache
-  // the result.
-  virtual bool IsAuthorized(int uid) = 0;
-};
-
-// EXPERIMENTAL Allows all connection. Anything on the Android device will be
-// able to connect, use with caution!
-class UntrustedSecurityPolicy : public SecurityPolicy {
- public:
-  UntrustedSecurityPolicy();
-  ~UntrustedSecurityPolicy() override;
-  bool IsAuthorized(int uid) override;
-};
-
-// EXPERIMENTAL Only allows the connections from processes with the same UID. In
-// most cases this means "from the same APK".
-class InternalOnlySecurityPolicy : public SecurityPolicy {
- public:
-  InternalOnlySecurityPolicy();
-  ~InternalOnlySecurityPolicy() override;
-  bool IsAuthorized(int uid) override;
-};
-
-#ifdef GPR_ANDROID
-
-// EXPERIMENTAL Only allows the connections from the APK that have the same
-// signature.
-class SameSignatureSecurityPolicy : public SecurityPolicy {
- public:
-  // `context` is required for getting PackageManager Java class
-  SameSignatureSecurityPolicy(JavaVM* jvm, jobject context);
-  ~SameSignatureSecurityPolicy() override;
-  bool IsAuthorized(int uid) override;
-
- private:
-  JavaVM* jvm_;
-  jobject context_;
-};
-
-#endif
-
-}  // namespace binder
-}  // namespace experimental
-}  // namespace grpc
-
-#endif  // GRPCPP_SECURITY_BINDER_SECURITY_POLICY_H
diff --git a/package.xml b/package.xml
index ad87956964b..4b98fee2c78 100644
--- a/package.xml
+++ b/package.xml
@@ -1693,7 +1693,6 @@
     <file baseinstalldir="/" name="src/core/load_balancing/xds/xds_wrr_locality.cc" role="src" />
     <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
     <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry_extra.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/resolver/binder/binder_resolver.cc" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.cc" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/dns_resolver_ares.h" role="src" />
     <file baseinstalldir="/" name="src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h" role="src" />
diff --git a/src/core/BUILD b/src/core/BUILD
index a566a3bd574..c1482a15c5c 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -38,10 +38,7 @@ config_setting(
 # the top-level BUILD file that have not yet been moved here. Should go away
 # once the transition is complete.
 exports_files(
-    glob(
-        ["**"],
-        exclude = ["ext/transport/binder/java/**"],
-    ),
+    glob(["**"]),
     visibility = ["//:__subpackages__"],
 )
 
@@ -7199,33 +7196,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "grpc_resolver_binder",
-    srcs = [
-        "resolver/binder/binder_resolver.cc",
-    ],
-    external_deps = [
-        "absl/log:log",
-        "absl/status",
-        "absl/status:statusor",
-        "absl/strings",
-    ],
-    language = "c++",
-    deps = [
-        "channel_args",
-        "error",
-        "iomgr_port",
-        "resolved_address",
-        "status_helper",
-        "//:config",
-        "//:endpoint_addresses",
-        "//:gpr",
-        "//:grpc_resolver",
-        "//:orphanable",
-        "//:uri",
-    ],
-)
-
 grpc_cc_library(
     name = "grpc_resolver_xds_attributes",
     hdrs = [
diff --git a/src/core/ext/transport/binder/README.md b/src/core/ext/transport/binder/README.md
deleted file mode 100644
index 74200cd371d..00000000000
--- a/src/core/ext/transport/binder/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Binder transport for cross process IPC on Android
-
-EXPERIMENTAL. API stability not guaranteed.
-
-This transport implements
-[BinderChannel for native cross-process communication on Android](https://github.com/grpc/proposal/blob/master/L73-java-binderchannel.md) and enables C++/Java cross-process communication on Android with gRPC.
-
-Tests: https://github.com/grpc/grpc/tree/master/test/core/transport/binder/
-
-Example apps: https://github.com/grpc/grpc/tree/master/examples/android/binder/java/io/grpc/binder/cpp
diff --git a/src/core/ext/transport/binder/client/binder_connector.cc b/src/core/ext/transport/binder/client/binder_connector.cc
deleted file mode 100644
index 1317219a173..00000000000
--- a/src/core/ext/transport/binder/client/binder_connector.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/ext/transport/binder/client/binder_connector.h"
-#include "src/core/lib/iomgr/port.h"
-
-#ifdef GRPC_HAVE_UNIX_SOCKET
-#ifdef GPR_WINDOWS
-// clang-format off
-#include <ws2def.h>
-#include <afunix.h>
-// clang-format on
-#else
-#include <sys/un.h>
-#endif  // GPR_WINDOWS
-#endif
-
-#include <grpcpp/security/binder_security_policy.h>
-
-#include <functional>
-#include <map>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "src/core/client_channel/connector.h"
-#include "src/core/client_channel/subchannel.h"
-#include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
-#include "src/core/ext/transport/binder/client/security_policy_setting.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-
-namespace {
-
-// TODO(mingcl): Currently this does no error handling and assumes the
-// connection always succeeds in reasonable amount of time.
-class BinderConnector : public grpc_core::SubchannelConnector {
- public:
-  BinderConnector() {}
-  ~BinderConnector() override {}
-  void Connect(const Args& args, Result* result,
-               grpc_closure* notify) override {
-#ifdef GRPC_HAVE_UNIX_SOCKET
-    {
-      struct sockaddr_un* un =
-          reinterpret_cast<struct sockaddr_un*>(args.address->addr);
-      // length of identifier, including null terminator
-      size_t id_length = args.address->len - sizeof(un->sun_family);
-      // The c-style string at least will have a null terminator, and the
-      // connection id itself should not be empty
-      CHECK_GE(id_length, 2u);
-      // Make sure there is null terminator at the expected location before
-      // reading from it
-      CHECK_EQ(un->sun_path[id_length - 1], '\0');
-      conn_id_ = un->sun_path;
-    }
-#else
-    CHECK(0);
-#endif
-    LOG(INFO) << "BinderConnector " << this << " conn_id_ = " << conn_id_;
-
-    args_ = args;
-    CHECK_EQ(notify_, nullptr);
-    CHECK_NE(notify, nullptr);
-    notify_ = notify;
-    result_ = result;
-
-    Ref().release();  // Ref held by the following callback
-
-    grpc_binder::GetEndpointBinderPool()->GetEndpointBinder(
-        conn_id_,
-        std::bind(&BinderConnector::OnConnected, this, std::placeholders::_1));
-  }
-
-  void OnConnected(std::unique_ptr<grpc_binder::Binder> endpoint_binder) {
-    CHECK(endpoint_binder != nullptr);
-    grpc_core::Transport* transport = grpc_create_binder_transport_client(
-        std::move(endpoint_binder),
-        grpc_binder::GetSecurityPolicySetting()->Get(conn_id_));
-    CHECK_NE(transport, nullptr);
-    result_->channel_args = args_.channel_args;
-    result_->transport = transport;
-
-    CHECK_NE(notify_, nullptr);
-    // ExecCtx is required here for running grpc_closure because this callback
-    // might be invoked from non-gRPC code
-    if (grpc_core::ExecCtx::Get() == nullptr) {
-      grpc_core::ExecCtx exec_ctx;
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, notify_, absl::OkStatus());
-    } else {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, notify_, absl::OkStatus());
-    }
-
-    Unref();  // Was referenced in BinderConnector::Connect
-  }
-  void Shutdown(grpc_error_handle /*error*/) override {}
-
- private:
-  Args args_;
-  grpc_closure* notify_ = nullptr;
-  Result* result_ = nullptr;
-
-  std::string conn_id_;
-};
-
-}  // namespace
-
-namespace grpc_core {
-
-RefCountedPtr<Subchannel> BinderClientChannelFactory::CreateSubchannel(
-    const grpc_resolved_address& address, const ChannelArgs& args) {
-  LOG(INFO) << "BinderClientChannelFactory creating subchannel " << this;
-  return Subchannel::Create(
-      MakeOrphanable<BinderConnector>(), address,
-      args.Set(GRPC_ARG_DEFAULT_AUTHORITY, "binder.authority"));
-}
-
-}  // namespace grpc_core
-
-#endif  // GRPC_NO_BINDER
diff --git a/src/core/ext/transport/binder/client/binder_connector.h b/src/core/ext/transport/binder/client/binder_connector.h
deleted file mode 100644
index 5ce6d86e583..00000000000
--- a/src/core/ext/transport/binder/client/binder_connector.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H
-
-#include <grpc/impl/grpc_types.h>
-#include <grpc/support/port_platform.h>
-#include <grpcpp/channel.h>
-#include <grpcpp/support/channel_arguments.h>
-
-#include <memory>
-#include <utility>
-
-#include "absl/strings/string_view.h"
-#include "absl/strings/strip.h"
-#include "src/core/client_channel/client_channel_factory.h"
-#include "src/core/client_channel/client_channel_filter.h"
-
-namespace grpc_core {
-
-class BinderClientChannelFactory : public ClientChannelFactory {
- public:
-  RefCountedPtr<Subchannel> CreateSubchannel(
-      const grpc_resolved_address& address, const ChannelArgs& args) override;
-};
-
-}  // namespace grpc_core
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_BINDER_CONNECTOR_H
diff --git a/src/core/ext/transport/binder/client/channel_create.cc b/src/core/ext/transport/binder/client/channel_create.cc
deleted file mode 100644
index 483d488afaa..00000000000
--- a/src/core/ext/transport/binder/client/channel_create.cc
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <grpcpp/create_channel_binder.h>
-
-// The interface is only defined if GPR_ANDROID is defined, because some
-// arguments requires JNI.
-// Furthermore, the interface is non-phony only when
-// GPR_SUPPORT_BINDER_TRANSPORT is true because actual implementation of binder
-// transport requires newer version of NDK API
-
-#ifdef GPR_ANDROID
-
-#include <grpc/grpc.h>
-#include <grpc/grpc_posix.h>
-
-#include "src/core/util/crash.h"
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/impl/grpc_library.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/substitute.h"
-#include "absl/time/clock.h"
-#include "absl/time/time.h"
-#include "src/core/client_channel/client_channel_filter.h"
-#include "src/core/ext/transport/binder/client/channel_create_impl.h"
-#include "src/core/ext/transport/binder/client/connection_id_generator.h"
-#include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
-#include "src/core/ext/transport/binder/client/jni_utils.h"
-#include "src/core/ext/transport/binder/client/security_policy_setting.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/binder_android.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/surface/channel.h"
-#include "src/core/lib/transport/transport.h"
-#include "src/cpp/client/create_channel_internal.h"
-
-namespace {
-// grpc.io.action.BIND is the standard action name for binding to binder
-// transport server.
-const char* kStandardActionName = "grpc.io.action.BIND";
-}  // namespace
-
-namespace grpc {
-namespace experimental {
-
-std::shared_ptr<grpc::Channel> CreateBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view package_name,
-    absl::string_view class_name,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy) {
-  return CreateCustomBinderChannel(jni_env_void, context, package_name,
-                                   class_name, security_policy,
-                                   ChannelArguments());
-}
-
-std::shared_ptr<grpc::Channel> CreateCustomBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view package_name,
-    absl::string_view class_name,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy,
-    const ChannelArguments& args) {
-  return CreateCustomBinderChannel(
-      jni_env_void, context,
-      absl::Substitute("android-app://$0#Intent;action=$1;component=$0/$2;end",
-                       package_name, kStandardActionName, class_name),
-      security_policy, args);
-}
-
-std::shared_ptr<grpc::Channel> CreateBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view uri,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy) {
-  return CreateCustomBinderChannel(jni_env_void, context, uri, security_policy,
-                                   ChannelArguments());
-}
-
-std::shared_ptr<grpc::Channel> CreateCustomBinderChannel(
-    void* jni_env_void, jobject context, absl::string_view uri,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy,
-    const ChannelArguments& args) {
-  grpc_init();
-
-  CHECK_NE(jni_env_void, nullptr);
-  CHECK_NE(security_policy, nullptr);
-
-  // Generate an unique connection ID that identifies this connection (Useful
-  // for mapping connection between Java and C++ code).
-  std::string connection_id =
-      grpc_binder::GetConnectionIdGenerator()->Generate(uri);
-
-  LOG(ERROR) << "connection id is " << connection_id;
-
-  // After invoking this Java method, Java code will put endpoint binder into
-  // `EndpointBinderPool` after the connection succeeds
-  // TODO(mingcl): Consider if we want to delay the connection establishment
-  // until SubchannelConnector start establishing connection. For now we don't
-  // see any benifits doing that.
-  grpc_binder::TryEstablishConnectionWithUri(static_cast<JNIEnv*>(jni_env_void),
-                                             context, uri, connection_id);
-
-  grpc_binder::GetSecurityPolicySetting()->Set(connection_id, security_policy);
-
-  // Set server URI to a URI that contains connection id. The URI will be used
-  // by subchannel connector to obtain correct endpoint binder from
-  // `EndpointBinderPool`.
-  string server_uri = "binder:" + connection_id;
-
-  grpc_channel_args channel_args;
-  args.SetChannelArgs(&channel_args);
-
-  return CreateChannelInternal(
-      "",
-      grpc::internal::CreateClientBinderChannelImpl(server_uri, &channel_args),
-      std::vector<
-          std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>());
-}
-
-bool InitializeBinderChannelJavaClass(void* jni_env_void) {
-  return grpc_binder::FindNativeConnectionHelper(
-             static_cast<JNIEnv*>(jni_env_void)) != nullptr;
-}
-
-bool InitializeBinderChannelJavaClass(
-    void* jni_env_void, std::function<void*(std::string)> class_finder) {
-  return grpc_binder::FindNativeConnectionHelper(
-             static_cast<JNIEnv*>(jni_env_void), class_finder) != nullptr;
-}
-
-}  // namespace experimental
-}  // namespace grpc
-
-#else  // !GPR_SUPPORT_BINDER_TRANSPORT
-
-namespace grpc {
-namespace experimental {
-
-std::shared_ptr<grpc::Channel> CreateBinderChannel(
-    void*, jobject, absl::string_view, absl::string_view,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>) {
-  LOG(ERROR) << "This APK is compiled with Android API level = "
-             << __ANDROID_API__
-             << ", which is not supported. See port_platform.h for supported "
-                "versions.";
-  CHECK(0);
-  return {};
-}
-
-std::shared_ptr<grpc::Channel> CreateCustomBinderChannel(
-    void*, jobject, absl::string_view, absl::string_view,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>,
-    const ChannelArguments&) {
-  LOG(ERROR) << "This APK is compiled with Android API level = "
-             << __ANDROID_API__
-             << ", which is not supported. See port_platform.h for supported "
-                "versions.";
-  CHECK(0);
-  return {};
-}
-
-std::shared_ptr<grpc::Channel> CreateBinderChannel(
-    void*, jobject, absl::string_view,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>) {
-  LOG(ERROR) << "This APK is compiled with Android API level = "
-             << __ANDROID_API__
-             << ", which is not supported. See port_platform.h for supported "
-                "versions.";
-  CHECK(0);
-  return {};
-}
-
-std::shared_ptr<grpc::Channel> CreateCustomBinderChannel(
-    void*, jobject, absl::string_view,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>,
-    const ChannelArguments&) {
-  LOG(ERROR) << "This APK is compiled with Android API level = "
-             << __ANDROID_API__
-             << ", which is not supported. See port_platform.h for supported "
-                "versions.";
-  CHECK(0);
-  return {};
-}
-
-bool InitializeBinderChannelJavaClass(void* jni_env_void) {
-  LOG(ERROR) << "This APK is compiled with Android API level = "
-             << __ANDROID_API__
-             << ", which is not supported. See port_platform.h for supported "
-                "versions.";
-  CHECK(0);
-  return {};
-}
-
-bool InitializeBinderChannelJavaClass(
-    void* jni_env_void, std::function<void*(std::string)> class_finder) {
-  LOG(ERROR) << "This APK is compiled with Android API level = "
-             << __ANDROID_API__
-             << ", which is not supported. See port_platform.h for supported "
-                "versions.";
-  CHECK(0);
-  return {};
-}
-
-}  // namespace experimental
-}  // namespace grpc
-
-#endif  // GPR_SUPPORT_BINDER_TRANSPORT
-
-#endif  // GPR_ANDROID
-
-#endif  // GRPC_NO_BINDER
diff --git a/src/core/ext/transport/binder/client/channel_create_impl.cc b/src/core/ext/transport/binder/client/channel_create_impl.cc
deleted file mode 100644
index 1234c7c80fc..00000000000
--- a/src/core/ext/transport/binder/client/channel_create_impl.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/client/channel_create_impl.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <memory>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "src/core/ext/transport/binder/client/binder_connector.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/channel_create.h"
-
-namespace {
-
-grpc_core::BinderClientChannelFactory* g_factory;
-gpr_once g_factory_once = GPR_ONCE_INIT;
-
-void FactoryInit() { g_factory = new grpc_core::BinderClientChannelFactory(); }
-}  // namespace
-
-namespace grpc {
-namespace internal {
-
-grpc_channel* CreateDirectBinderChannelImplForTesting(
-    std::unique_ptr<grpc_binder::Binder> endpoint_binder,
-    const grpc_channel_args* args,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy) {
-  grpc_core::ExecCtx exec_ctx;
-
-  grpc_core::Transport* transport = grpc_create_binder_transport_client(
-      std::move(endpoint_binder), security_policy);
-  CHECK_NE(transport, nullptr);
-
-  auto channel_args = grpc_core::CoreConfiguration::Get()
-                          .channel_args_preconditioning()
-                          .PreconditionChannelArgs(args)
-                          .Set(GRPC_ARG_DEFAULT_AUTHORITY, "binder.authority");
-  auto channel =
-      grpc_core::ChannelCreate("binder_target_placeholder", channel_args,
-                               GRPC_CLIENT_DIRECT_CHANNEL, transport);
-  // TODO(mingcl): Handle error properly
-  CHECK(channel.ok());
-  grpc_channel_args_destroy(args);
-  return channel->release()->c_ptr();
-}
-
-grpc_channel* CreateClientBinderChannelImpl(std::string target,
-                                            const grpc_channel_args* args) {
-  grpc_core::ExecCtx exec_ctx;
-
-  gpr_once_init(&g_factory_once, FactoryInit);
-
-  auto channel_args = grpc_core::CoreConfiguration::Get()
-                          .channel_args_preconditioning()
-                          .PreconditionChannelArgs(args)
-                          .SetObject(g_factory);
-
-  auto channel = grpc_core::ChannelCreate(target, channel_args,
-                                          GRPC_CLIENT_CHANNEL, nullptr);
-
-  if (!channel.ok()) {
-    return grpc_lame_client_channel_create(
-        target.c_str(), static_cast<grpc_status_code>(channel.status().code()),
-        "Failed to create binder channel");
-  }
-
-  return channel->release()->c_ptr();
-}
-
-}  // namespace internal
-}  // namespace grpc
-#endif
diff --git a/src/core/ext/transport/binder/client/channel_create_impl.h b/src/core/ext/transport/binder/client/channel_create_impl.h
deleted file mode 100644
index 0cc87a5a62e..00000000000
--- a/src/core/ext/transport/binder/client/channel_create_impl.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/lib/channel/channel_args.h"
-
-namespace grpc {
-namespace internal {
-
-// Creates a GRPC_CLIENT_DIRECT_CHANNEL channel from endpoint binder
-// At this moment this is only used for testing.
-grpc_channel* CreateDirectBinderChannelImplForTesting(
-    std::unique_ptr<grpc_binder::Binder> endpoint_binder,
-    const grpc_channel_args* args,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy);
-
-// Creates a GRPC_CLIENT_CHANNEL channel
-grpc_channel* CreateClientBinderChannelImpl(std::string target,
-                                            const grpc_channel_args* args);
-
-}  // namespace internal
-}  // namespace grpc
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CHANNEL_CREATE_IMPL_H
diff --git a/src/core/ext/transport/binder/client/connection_id_generator.cc b/src/core/ext/transport/binder/client/connection_id_generator.cc
deleted file mode 100644
index 60cba34e31b..00000000000
--- a/src/core/ext/transport/binder/client/connection_id_generator.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/client/connection_id_generator.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include "absl/log/check.h"
-#include "absl/strings/str_cat.h"
-
-namespace {
-// Make sure `s` does not contain characters other than numbers, alphabets,
-// period and underscore
-std::string Normalize(absl::string_view str_view) {
-  std::string s = std::string(str_view);
-  for (size_t i = 0; i < s.length(); i++) {
-    if (!isalnum(s[i]) && s[i] != '.') {
-      s[i] = '_';
-    }
-  }
-  return s;
-}
-
-// Remove prefix of the string if the string is longer than len
-std::string StripToLength(const std::string& s, size_t len) {
-  if (s.length() > len) {
-    return s.substr(s.length() - len, len);
-  }
-  return s;
-}
-}  // namespace
-
-namespace grpc_binder {
-
-std::string ConnectionIdGenerator::Generate(absl::string_view uri) {
-  // reserve some room for serial number
-  const size_t kReserveForNumbers = 15;
-  std::string s =
-      StripToLength(Normalize(uri), kPathLengthLimit - kReserveForNumbers);
-  std::string ret;
-  {
-    grpc_core::MutexLock l(&m_);
-    // Insert a hyphen before serial number
-    ret = absl::StrCat(s, "-", ++count_);
-  }
-  CHECK_LT(ret.length(), kPathLengthLimit);
-  return ret;
-}
-
-ConnectionIdGenerator* GetConnectionIdGenerator() {
-  static ConnectionIdGenerator* cig = new ConnectionIdGenerator();
-  return cig;
-}
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/client/connection_id_generator.h b/src/core/ext/transport/binder/client/connection_id_generator.h
deleted file mode 100644
index 6e2b98d4ea1..00000000000
--- a/src/core/ext/transport/binder/client/connection_id_generator.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H
-
-#include <grpc/support/port_platform.h>
-
-#include <map>
-
-#include "absl/strings/string_view.h"
-#include "src/core/util/sync.h"
-
-namespace grpc_binder {
-
-// Generates somewhat human-readable unique identifiers from package name and
-// class name. We will generate a Id that only contains unreserved URI
-// characters (uppercase and lowercase letters, decimal digits, hyphen, period,
-// underscore, and tilde).
-class ConnectionIdGenerator {
- public:
-  std::string Generate(absl::string_view uri);
-
- private:
-  // Our generated Id need to fit in unix socket path length limit. We use 100
-  // here to be safe.
-  const size_t kPathLengthLimit = 100;
-
-  grpc_core::Mutex m_;
-  // Every generated identifier will followed by the value of this counter to
-  // make sure every generated id is unique.
-  int count_ ABSL_GUARDED_BY(m_);
-};
-
-ConnectionIdGenerator* GetConnectionIdGenerator();
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_CONNECTION_ID_GENERATOR_H
diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc b/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
deleted file mode 100644
index b64436acb5a..00000000000
--- a/src/core/ext/transport/binder/client/endpoint_binder_pool.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
-
-#include <grpc/support/port_platform.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/ext/transport/binder/client/jni_utils.h"
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <jni.h>
-
-#include "src/core/ext/transport/binder/wire_format/binder_android.h"
-
-extern "C" {
-// Adds endpoint binder to binder pool when Java notify us that the endpoint
-// binder is ready. This is called from GrpcBinderConnection.java
-JNIEXPORT void JNICALL
-Java_io_grpc_binder_cpp_GrpcBinderConnection_notifyConnected__Ljava_lang_String_2Landroid_os_IBinder_2(
-    JNIEnv* jni_env, jobject, jstring conn_id_jstring, jobject ibinder) {
-  jboolean isCopy;
-  const char* conn_id = jni_env->GetStringUTFChars(conn_id_jstring, &isCopy);
-  LOG(INFO) << __func__ << " invoked with conn_id = " << conn_id;
-  CHECK_NE(ibinder, nullptr);
-  grpc_binder::ndk_util::SpAIBinder aibinder =
-      grpc_binder::FromJavaBinder(jni_env, ibinder);
-  LOG(INFO) << __func__ << " got aibinder = " << aibinder.get();
-  auto b = std::make_unique<grpc_binder::BinderAndroid>(aibinder);
-  CHECK(b != nullptr);
-  grpc_binder::GetEndpointBinderPool()->AddEndpointBinder(conn_id,
-                                                          std::move(b));
-  if (isCopy == JNI_TRUE) {
-    jni_env->ReleaseStringUTFChars(conn_id_jstring, conn_id);
-  }
-}
-}
-
-#endif  // GPR_SUPPORT_BINDER_TRANSPORT
-
-namespace grpc_binder {
-
-void EndpointBinderPool::GetEndpointBinder(
-    std::string conn_id,
-    std::function<void(std::unique_ptr<grpc_binder::Binder>)> cb) {
-  LOG(INFO) << "EndpointBinder requested. conn_id = " << conn_id;
-  std::unique_ptr<grpc_binder::Binder> b;
-  {
-    grpc_core::MutexLock l(&m_);
-    if (binder_map_.count(conn_id)) {
-      b = std::move(binder_map_[conn_id]);
-      binder_map_.erase(conn_id);
-      CHECK(b != nullptr);
-    } else {
-      if (pending_requests_.count(conn_id) != 0) {
-        LOG(ERROR) << "Duplicate GetEndpointBinder requested. conn_id = "
-                   << conn_id;
-        return;
-      }
-      pending_requests_[conn_id] = std::move(cb);
-      return;
-    }
-  }
-  CHECK(b != nullptr);
-  cb(std::move(b));
-}
-
-void EndpointBinderPool::AddEndpointBinder(
-    std::string conn_id, std::unique_ptr<grpc_binder::Binder> b) {
-  LOG(INFO) << "EndpointBinder added. conn_id = " << conn_id;
-  CHECK(b != nullptr);
-  // cb will be set in the following block if there is a pending callback
-  std::function<void(std::unique_ptr<grpc_binder::Binder>)> cb = nullptr;
-  {
-    grpc_core::MutexLock l(&m_);
-    if (binder_map_.count(conn_id) != 0) {
-      LOG(ERROR) << "EndpointBinder already in the pool. conn_id = " << conn_id;
-      return;
-    }
-    if (pending_requests_.count(conn_id)) {
-      cb = std::move(pending_requests_[conn_id]);
-      pending_requests_.erase(conn_id);
-    } else {
-      binder_map_[conn_id] = std::move(b);
-      b = nullptr;
-    }
-  }
-  if (cb != nullptr) {
-    cb(std::move(b));
-  }
-}
-
-EndpointBinderPool* GetEndpointBinderPool() {
-  static EndpointBinderPool* p = new EndpointBinderPool();
-  return p;
-}
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/client/endpoint_binder_pool.h b/src/core/ext/transport/binder/client/endpoint_binder_pool.h
deleted file mode 100644
index 997c36e76a6..00000000000
--- a/src/core/ext/transport/binder/client/endpoint_binder_pool.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H
-
-#include <grpc/support/port_platform.h>
-
-#include <functional>
-#include <string>
-
-#include "absl/container/flat_hash_map.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/util/sync.h"
-
-namespace grpc_binder {
-
-// This class serves as a buffer of endpoint binders between C++ and
-// Java. `AddEndpointBinder` will be indirectly invoked by Java code, and
-// `GetEndpointBinder` is for C++ code to register callback to get endpoint
-// binder when become available. This simplifies JNI related threading issues
-// since both side only need to interact with this buffer in non-blocking
-// manner and avoids cross-language callbacks.
-class EndpointBinderPool {
- public:
-  // Invokes the callback when the binder corresponding to the conn_id become
-  // available. If the binder is already available, invokes the callback
-  // immediately.
-  // Ownership of the endpoint binder will be transferred to the callback
-  // function and it will be removed from the pool
-  void GetEndpointBinder(
-      std::string conn_id,
-      std::function<void(std::unique_ptr<grpc_binder::Binder>)> cb);
-
-  // Add an endpoint binder to the pool
-  void AddEndpointBinder(std::string conn_id,
-                         std::unique_ptr<grpc_binder::Binder> b);
-
- private:
-  grpc_core::Mutex m_;
-  absl::flat_hash_map<std::string, std::unique_ptr<grpc_binder::Binder>>
-      binder_map_ ABSL_GUARDED_BY(m_);
-  absl::flat_hash_map<std::string,
-                      std::function<void(std::unique_ptr<grpc_binder::Binder>)>>
-      pending_requests_ ABSL_GUARDED_BY(m_);
-};
-
-// Returns the singleton
-EndpointBinderPool* GetEndpointBinderPool();
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_ENDPOINT_BINDER_POOL_H
diff --git a/src/core/ext/transport/binder/client/jni_utils.cc b/src/core/ext/transport/binder/client/jni_utils.cc
deleted file mode 100644
index 3f13e269b0c..00000000000
--- a/src/core/ext/transport/binder/client/jni_utils.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/client/jni_utils.h"
-
-#include <grpc/support/port_platform.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/util/crash.h"
-
-#if defined(ANDROID) || defined(__ANDROID__)
-
-namespace grpc_binder {
-
-jclass FindNativeConnectionHelper(JNIEnv* env) {
-  return FindNativeConnectionHelper(
-      env, [env](std::string cl) { return env->FindClass(cl.c_str()); });
-}
-
-jclass FindNativeConnectionHelper(
-    JNIEnv* env, std::function<void*(std::string)> class_finder) {
-  auto do_find = [env, class_finder]() {
-    jclass cl = static_cast<jclass>(
-        class_finder("io/grpc/binder/cpp/NativeConnectionHelper"));
-    if (cl == nullptr) {
-      return cl;
-    }
-    jclass global_cl = static_cast<jclass>(env->NewGlobalRef(cl));
-    env->DeleteLocalRef(cl);
-    CHECK_NE(global_cl, nullptr);
-    return global_cl;
-  };
-  static jclass connection_helper_class = do_find();
-  if (connection_helper_class != nullptr) {
-    return connection_helper_class;
-  }
-  // Some possible reasons:
-  //   * There is no Java class in the call stack and this is not invoked
-  //   from JNI_OnLoad
-  //   * The APK does not correctly depends on the helper class, or the
-  //   class get shrinked
-  LOG(ERROR)
-      << "Cannot find binder transport Java helper class. Did you invoke "
-         "grpc::experimental::InitializeBinderChannelJavaClass correctly "
-         "beforehand? Did the APK correctly include the connection helper "
-         "class (i.e depends on build target "
-         "src/core/ext/transport/binder/java/io/grpc/binder/"
-         "cpp:connection_helper) ?";
-  // TODO(mingcl): Maybe it is worth to try again so the failure can be fixed
-  // by invoking this function again at a different thread.
-  return nullptr;
-}
-
-void TryEstablishConnection(JNIEnv* env, jobject application,
-                            absl::string_view pkg, absl::string_view cls,
-                            absl::string_view action_name,
-                            absl::string_view conn_id) {
-  std::string method = "tryEstablishConnection";
-  std::string type =
-      "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/"
-      "lang/String;Ljava/lang/String;)V";
-
-  jclass cl = FindNativeConnectionHelper(env);
-  if (cl == nullptr) {
-    return;
-  }
-
-  jmethodID mid = env->GetStaticMethodID(cl, method.c_str(), type.c_str());
-  if (mid == nullptr) {
-    LOG(ERROR) << "No method id " << method;
-  }
-
-  env->CallStaticVoidMethod(cl, mid, application,
-                            env->NewStringUTF(std::string(pkg).c_str()),
-                            env->NewStringUTF(std::string(cls).c_str()),
-                            env->NewStringUTF(std::string(action_name).c_str()),
-                            env->NewStringUTF(std::string(conn_id).c_str()));
-}
-
-void TryEstablishConnectionWithUri(JNIEnv* env, jobject application,
-                                   absl::string_view uri,
-                                   absl::string_view conn_id) {
-  std::string method = "tryEstablishConnectionWithUri";
-  std::string type =
-      "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V";
-
-  jclass cl = FindNativeConnectionHelper(env);
-  if (cl == nullptr) {
-    return;
-  }
-
-  jmethodID mid = env->GetStaticMethodID(cl, method.c_str(), type.c_str());
-  if (mid == nullptr) {
-    LOG(ERROR) << "No method id " << method;
-  }
-
-  env->CallStaticVoidMethod(cl, mid, application,
-                            env->NewStringUTF(std::string(uri).c_str()),
-                            env->NewStringUTF(std::string(conn_id).c_str()));
-}
-
-bool IsSignatureMatch(JNIEnv* env, jobject context, int uid1, int uid2) {
-  const std::string method = "isSignatureMatch";
-  const std::string type = "(Landroid/content/Context;II)Z";
-
-  jclass cl = FindNativeConnectionHelper(env);
-  if (cl == nullptr) {
-    return false;
-  }
-
-  jmethodID mid = env->GetStaticMethodID(cl, method.c_str(), type.c_str());
-  if (mid == nullptr) {
-    LOG(ERROR) << "No method id " << method;
-  }
-
-  jboolean result = env->CallStaticBooleanMethod(cl, mid, context, uid1, uid2);
-  return result == JNI_TRUE;
-}
-
-}  // namespace grpc_binder
-
-#endif
-#endif
diff --git a/src/core/ext/transport/binder/client/jni_utils.h b/src/core/ext/transport/binder/client/jni_utils.h
deleted file mode 100644
index c83949d3bf0..00000000000
--- a/src/core/ext/transport/binder/client/jni_utils.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_JNI_UTILS_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_JNI_UTILS_H
-
-#if defined(ANDROID) || defined(__ANDROID__)
-
-#include <grpc/support/port_platform.h>
-#include <jni.h>
-
-#include <functional>
-#include <string>
-
-#include "absl/strings/string_view.h"
-
-namespace grpc_binder {
-
-// Finds NativeConnectionHelper Java class and caches it. This is useful because
-// FindClass only works when there is a Java class in the call stack. Typically
-// user might want to call this once in a place that is called from Java (ex.
-// JNI_OnLoad) so subsequent BinderTransport code can find Java class
-jclass FindNativeConnectionHelper(JNIEnv* env);
-
-jclass FindNativeConnectionHelper(
-    JNIEnv* env, std::function<void*(std::string)> class_finder);
-
-// Calls Java method NativeConnectionHelper.tryEstablishConnection
-void TryEstablishConnection(JNIEnv* env, jobject application,
-                            absl::string_view pkg, absl::string_view cls,
-                            absl::string_view action_name,
-                            absl::string_view conn_id);
-
-void TryEstablishConnectionWithUri(JNIEnv* env, jobject application,
-                                   absl::string_view uri,
-                                   absl::string_view conn_id);
-
-// Calls Java method NativeConnectionHelper.isSignatureMatch.
-// Will also return false if failed to invoke Java.
-bool IsSignatureMatch(JNIEnv* env, jobject context, int uid1, int uid2);
-
-}  // namespace grpc_binder
-
-#endif
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_JNI_UTILS_H
diff --git a/src/core/ext/transport/binder/client/security_policy_setting.cc b/src/core/ext/transport/binder/client/security_policy_setting.cc
deleted file mode 100644
index c08a83324c3..00000000000
--- a/src/core/ext/transport/binder/client/security_policy_setting.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#include "absl/log/check.h"
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/ext/transport/binder/client/security_policy_setting.h"
-
-namespace grpc_binder {
-
-void SecurityPolicySetting::Set(
-    absl::string_view connection_id,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy) {
-  grpc_core::MutexLock l(&m_);
-  CHECK_EQ(security_policy_map_.count(std::string(connection_id)), 0u);
-  security_policy_map_[std::string(connection_id)] = security_policy;
-}
-
-std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-SecurityPolicySetting::Get(absl::string_view connection_id) {
-  grpc_core::MutexLock l(&m_);
-  CHECK_NE(security_policy_map_.count(std::string(connection_id)), 0u);
-  return security_policy_map_[std::string(connection_id)];
-}
-
-SecurityPolicySetting* GetSecurityPolicySetting() {
-  static SecurityPolicySetting* s = new SecurityPolicySetting();
-  return s;
-}
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/client/security_policy_setting.h b/src/core/ext/transport/binder/client/security_policy_setting.h
deleted file mode 100644
index cd386693408..00000000000
--- a/src/core/ext/transport/binder/client/security_policy_setting.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
-#include "absl/container/flat_hash_map.h"
-#include "absl/strings/string_view.h"
-#include "src/core/util/sync.h"
-
-namespace grpc_binder {
-
-// A singleton class for setting security setting for each connection. This is
-// required because we cannot pass security policy shared pointers around using
-// gRPC arguments, we can only pass connection_id around as part of URI
-class SecurityPolicySetting {
- public:
-  void Set(absl::string_view connection_id,
-           std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-               security_policy);
-  std::shared_ptr<grpc::experimental::binder::SecurityPolicy> Get(
-      absl::string_view connection_id);
-
- private:
-  grpc_core::Mutex m_;
-  absl::flat_hash_map<
-      std::string, std::shared_ptr<grpc::experimental::binder::SecurityPolicy>>
-      security_policy_map_ ABSL_GUARDED_BY(m_);
-};
-
-SecurityPolicySetting* GetSecurityPolicySetting();
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_CLIENT_SECURITY_POLICY_SETTING_H
diff --git a/src/core/ext/transport/binder/java/WORKSPACE b/src/core/ext/transport/binder/java/WORKSPACE
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
deleted file mode 100644
index 5e63c32bc51..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# copybara: Import internal android_library rule here
-
-licenses(["notice"])
-
-android_library(
-    name = "connection_helper",
-    srcs = [
-        "GrpcBinderConnection.java",
-        "GrpcCppServerBuilder.java",
-        "NativeConnectionHelper.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        # copybara: Add proguard dependency here
-    ],
-)
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
deleted file mode 100644
index b55fe7405e7..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcBinderConnection.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package io.grpc.binder.cpp;
-
-import static android.content.Intent.URI_ANDROID_APP_SCHEME;
-import static android.content.Intent.URI_INTENT_SCHEME;
-
-import android.annotation.TargetApi;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import android.util.Log;
-import java.net.URISyntaxException;
-
-/* Handles the binder connection state with OnDeviceServer server */
-public class GrpcBinderConnection implements ServiceConnection {
-  private static final String logTag = "GrpcBinderConnection";
-
-  private Context mContext;
-  private IBinder mService;
-
-  // A string that identifies this service connection
-  private final String mConnId;
-
-  public GrpcBinderConnection(Context context, String connId) {
-    mContext = context;
-    mConnId = connId;
-  }
-
-  @Override
-  public void onNullBinding(ComponentName className) {
-    // TODO(mingcl): Notify C++ that the connection is never going to happen
-    Log.e(logTag, "Service returned null IBinder. mConnId = " + mConnId);
-  }
-
-  @Override
-  public void onServiceConnected(ComponentName className, IBinder service) {
-    Log.e(logTag, "Service has connected. mConnId = " + mConnId);
-    if (service == null) {
-      // This should not happen since onNullBinding should be invoked instead
-      throw new IllegalArgumentException("service was null");
-    }
-    synchronized (this) {
-      mService = service;
-    }
-    notifyConnected(mConnId, mService);
-  }
-
-  @Override
-  public void onServiceDisconnected(ComponentName className) {
-    Log.e(logTag, "Service has disconnected. mConnId = " + mConnId);
-  }
-
-  public void tryConnect(String pkg, String cls, String action_name) {
-    Intent intent = new Intent(action_name);
-    ComponentName compName = new ComponentName(pkg, cls);
-    intent.setComponent(compName);
-    tryConnect(intent);
-  }
-
-  @TargetApi(22)
-  public void tryConnect(String uri) {
-    // Try connect with an URI that can be parsed as intent.
-    try {
-      tryConnect(Intent.parseUri(uri, URI_ANDROID_APP_SCHEME | URI_INTENT_SCHEME));
-    } catch (URISyntaxException e) {
-      Log.e(logTag, "Unable to parse the Uri: " + uri);
-    }
-  }
-
-  private void tryConnect(Intent intent) {
-    synchronized (this) {
-      // Will return true if the system is in the process of bringing up a service that your client
-      // has permission to bind to; false if the system couldn't find the service or if your client
-      // doesn't have permission to bind to it
-      boolean result = mContext.bindService(intent, this, Context.BIND_AUTO_CREATE);
-      if (result) {
-        Log.e(logTag, "bindService returns ok");
-      } else {
-        Log.e(
-            logTag,
-            "bindService failed. Maybe the system couldn't find the service or the"
-                + " client doesn't have permission to bind to it.");
-      }
-    }
-  }
-
-  // Calls a function defined in endpoint_binder_pool.cc
-  private static native void notifyConnected(String connId, IBinder service);
-}
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
deleted file mode 100644
index 680a38e5fee..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package io.grpc.binder.cpp;
-
-import android.os.IBinder;
-import android.util.Log;
-
-/* EXPERIMENTAL. Provides a interface to get endpoint binder from C++ */
-public class GrpcCppServerBuilder {
-  private static final String logTag = "GrpcCppServerBuilder";
-
-  public static IBinder GetEndpointBinder(String uri) {
-    String scheme = "binder:";
-    if (uri.startsWith(scheme)) {
-      String path = uri.substring(scheme.length());
-      // TODO(mingcl): Consider if we would like to make sure the path only contain valid
-      // characters here
-      IBinder ibinder = GetEndpointBinderInternal(path);
-      Log.e(logTag, "Returning binder=" + ibinder + " for URI=" + uri);
-      return ibinder;
-    } else {
-      Log.e(logTag, "URI " + uri + " does not start with 'binder:'");
-      return null;
-    }
-  }
-
-  private static native IBinder GetEndpointBinderInternal(String conn_id);
-}
diff --git a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java b/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
deleted file mode 100644
index 6a05c88ff37..00000000000
--- a/src/core/ext/transport/binder/java/io/grpc/binder/cpp/NativeConnectionHelper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package io.grpc.binder.cpp;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Parcel;
-import android.util.Log;
-// copybara: Import proguard UsedByNative annotation here
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class will be invoked by gRPC binder transport internal implementation (from
- * src/core/ext/transport/binder/client/jni_utils.cc) to perform operations that are only possible
- * in Java
- */
-// copybara: Add @UsedByNative("jni_utils.cc")
-final class NativeConnectionHelper {
-  // Maps connection id to GrpcBinderConnection instances
-  static Map<String, GrpcBinderConnection> connectionIdToGrpcBinderConnectionMap = new HashMap<>();
-
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static void tryEstablishConnection(
-      Context context, String pkg, String cls, String actionName, String connId) {
-    // TODO(mingcl): Assert that connId is unique
-    connectionIdToGrpcBinderConnectionMap.put(connId, new GrpcBinderConnection(context, connId));
-    connectionIdToGrpcBinderConnectionMap.get(connId).tryConnect(pkg, cls, actionName);
-  }
-
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static void tryEstablishConnectionWithUri(Context context, String uri, String connId) {
-    // TODO(mingcl): Assert that connId is unique
-    connectionIdToGrpcBinderConnectionMap.put(connId, new GrpcBinderConnection(context, connId));
-    connectionIdToGrpcBinderConnectionMap.get(connId).tryConnect(uri);
-  }
-
-  // Returns true if the packages signature of the 2 UIDs match.
-  // `context` is used to get PackageManager.
-  // Suppress unnecessary internal warnings related to checkSignatures compatibility issue.
-  // BinderTransport code is only used on newer Android platform versions so this is fine.
-  @SuppressWarnings("CheckSignatures")
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static boolean isSignatureMatch(Context context, int uid1, int uid2) {
-    int result = context.getPackageManager().checkSignatures(uid1, uid2);
-    if (result == PackageManager.SIGNATURE_MATCH) {
-      return true;
-    }
-    Log.e(
-        "NativeConnectionHelper",
-        "Signatures does not match. checkSignature return value = " + result);
-    return false;
-  }
-
-  // copybara: Add @UsedByNative("jni_utils.cc")
-  static Parcel getEmptyParcel() {
-    return Parcel.obtain();
-  }
-}
diff --git a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc b/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
deleted file mode 100644
index 8126d4c6db7..00000000000
--- a/src/core/ext/transport/binder/security_policy/binder_security_policy.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <grpcpp/security/binder_security_policy.h>
-
-#ifdef GPR_ANDROID
-
-#include <jni.h>
-#include <unistd.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "src/core/ext/transport/binder/client/jni_utils.h"
-#include "src/core/util/crash.h"
-
-#endif
-
-namespace grpc {
-namespace experimental {
-namespace binder {
-
-UntrustedSecurityPolicy::UntrustedSecurityPolicy() = default;
-
-UntrustedSecurityPolicy::~UntrustedSecurityPolicy() = default;
-
-bool UntrustedSecurityPolicy::IsAuthorized(int) { return true; };
-
-InternalOnlySecurityPolicy::InternalOnlySecurityPolicy() = default;
-
-InternalOnlySecurityPolicy::~InternalOnlySecurityPolicy() = default;
-
-#ifdef GPR_ANDROID
-bool InternalOnlySecurityPolicy::IsAuthorized(int uid) {
-  return static_cast<uid_t>(uid) == getuid();
-}
-#else
-bool InternalOnlySecurityPolicy::IsAuthorized(int) { return false; }
-#endif
-
-#ifdef GPR_ANDROID
-
-namespace {
-JNIEnv* GetEnv(JavaVM* vm) {
-  if (vm == nullptr) return nullptr;
-
-  JNIEnv* result = nullptr;
-  jint attach = vm->AttachCurrentThread(&result, nullptr);
-
-  CHECK(JNI_OK == attach);
-  CHECK_NE(result, nullptr);
-  return result;
-}
-}  // namespace
-
-SameSignatureSecurityPolicy::SameSignatureSecurityPolicy(JavaVM* jvm,
-                                                         jobject context)
-    : jvm_(jvm) {
-  CHECK_NE(jvm, nullptr);
-  CHECK_NE(context, nullptr);
-
-  JNIEnv* env = GetEnv(jvm_);
-
-  // Make sure the context is still valid when IsAuthorized() is called
-  context_ = env->NewGlobalRef(context);
-  CHECK_NE(context_, nullptr);
-}
-
-SameSignatureSecurityPolicy::~SameSignatureSecurityPolicy() {
-  JNIEnv* env = GetEnv(jvm_);
-  env->DeleteLocalRef(context_);
-}
-
-bool SameSignatureSecurityPolicy::IsAuthorized(int uid) {
-  JNIEnv* env = GetEnv(jvm_);
-  bool result = grpc_binder::IsSignatureMatch(env, context_, getuid(), uid);
-  if (result) {
-    LOG(INFO) << "uid " << getuid() << " and uid " << uid
-              << " passed SameSignature check";
-  } else {
-    LOG(ERROR) << "uid " << getuid() << " and uid " << uid
-               << " failed SameSignature check";
-  }
-  return result;
-}
-
-#endif
-
-}  // namespace binder
-}  // namespace experimental
-}  // namespace grpc
-#endif
diff --git a/src/core/ext/transport/binder/security_policy/security_policy.h b/src/core/ext/transport/binder/security_policy/security_policy.h
deleted file mode 100644
index 4ef3da352f2..00000000000
--- a/src/core/ext/transport/binder/security_policy/security_policy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
-
-#include <grpc/support/port_platform.h>
-
-namespace grpc {
-namespace experimental {
-namespace binder {
-
-// This interface is for determining if a connection is allowed to be
-// established on Android. See https://source.android.com/security/app-sandbox
-// for more info about UID.
-class SecurityPolicy {
- public:
-  virtual ~SecurityPolicy() = default;
-  // Returns true if the UID is authorized to connect.
-  // Must return the same value for the same inputs so callers can safely cache
-  // the result.
-  virtual bool IsAuthorized(int uid) = 0;
-};
-
-}  // namespace binder
-}  // namespace experimental
-}  // namespace grpc
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SECURITY_POLICY_SECURITY_POLICY_H
diff --git a/src/core/ext/transport/binder/server/binder_server.cc b/src/core/ext/transport/binder/server/binder_server.cc
deleted file mode 100644
index 65d70c2fdb7..00000000000
--- a/src/core/ext/transport/binder/server/binder_server.cc
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/server/binder_server.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <grpc/grpc.h>
-
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/ext/transport/binder/utils/ndk_binder.h"
-#include "src/core/ext/transport/binder/wire_format/binder_android.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/transport/error_utils.h"
-#include "src/core/server/server.h"
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <jni.h>
-
-extern "C" {
-
-// This will be invoked from
-// src/core/ext/transport/binder/java/io/grpc/binder/cpp/GrpcCppServerBuilder.java
-JNIEXPORT jobject JNICALL
-Java_io_grpc_binder_cpp_GrpcCppServerBuilder_GetEndpointBinderInternal__Ljava_lang_String_2(
-    JNIEnv* jni_env, jobject, jstring conn_id_jstring) {
-  grpc_binder::ndk_util::AIBinder* ai_binder = nullptr;
-
-  {
-    // This block is the scope of conn_id c-string
-    jboolean isCopy;
-    const char* conn_id = jni_env->GetStringUTFChars(conn_id_jstring, &isCopy);
-    ai_binder = static_cast<grpc_binder::ndk_util::AIBinder*>(
-        grpc_get_endpoint_binder(std::string(conn_id)));
-    if (ai_binder == nullptr) {
-      LOG(ERROR) << "Cannot find endpoint binder with connection id = "
-                 << conn_id;
-    }
-    if (isCopy == JNI_TRUE) {
-      jni_env->ReleaseStringUTFChars(conn_id_jstring, conn_id);
-    }
-  }
-
-  if (ai_binder == nullptr) {
-    return nullptr;
-  }
-
-  return grpc_binder::ndk_util::AIBinder_toJavaBinder(jni_env, ai_binder);
-}
-}
-
-#endif
-
-namespace grpc {
-namespace experimental {
-namespace binder {
-
-void* GetEndpointBinder(const std::string& service) {
-  return grpc_get_endpoint_binder(service);
-}
-
-void AddEndpointBinder(const std::string& service, void* endpoint_binder) {
-  grpc_add_endpoint_binder(service, endpoint_binder);
-}
-
-void RemoveEndpointBinder(const std::string& service) {
-  grpc_remove_endpoint_binder(service);
-}
-
-}  // namespace binder
-}  // namespace experimental
-}  // namespace grpc
-
-static absl::flat_hash_map<std::string, void*>* g_endpoint_binder_pool =
-    nullptr;
-
-namespace {
-
-grpc_core::Mutex* GetBinderPoolMutex() {
-  static grpc_core::Mutex* mu = new grpc_core::Mutex();
-  return mu;
-}
-
-}  // namespace
-
-void grpc_add_endpoint_binder(const std::string& service,
-                              void* endpoint_binder) {
-  grpc_core::MutexLock lock(GetBinderPoolMutex());
-  if (g_endpoint_binder_pool == nullptr) {
-    g_endpoint_binder_pool = new absl::flat_hash_map<std::string, void*>();
-  }
-  (*g_endpoint_binder_pool)[service] = endpoint_binder;
-}
-
-void grpc_remove_endpoint_binder(const std::string& service) {
-  grpc_core::MutexLock lock(GetBinderPoolMutex());
-  if (g_endpoint_binder_pool == nullptr) {
-    return;
-  }
-  g_endpoint_binder_pool->erase(service);
-}
-
-void* grpc_get_endpoint_binder(const std::string& service) {
-  grpc_core::MutexLock lock(GetBinderPoolMutex());
-  if (g_endpoint_binder_pool == nullptr) {
-    return nullptr;
-  }
-  auto iter = g_endpoint_binder_pool->find(service);
-  return iter == g_endpoint_binder_pool->end() ? nullptr : iter->second;
-}
-
-namespace grpc_core {
-
-class BinderServerListener : public Server::ListenerInterface {
- public:
-  BinderServerListener(
-      Server* server, std::string addr, BinderTxReceiverFactory factory,
-      std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-          security_policy)
-      : server_(server),
-        addr_(std::move(addr)),
-        factory_(std::move(factory)),
-        security_policy_(security_policy) {}
-
-  void Start(Server* /*server*/,
-             const std::vector<grpc_pollset*>* /*pollsets*/) override {
-    tx_receiver_ = factory_(
-        [this](transaction_code_t code, grpc_binder::ReadableParcel* parcel,
-               int uid) { return OnSetupTransport(code, parcel, uid); });
-    endpoint_binder_ = tx_receiver_->GetRawBinder();
-    grpc_add_endpoint_binder(addr_, endpoint_binder_);
-  }
-
-  channelz::ListenSocketNode* channelz_listen_socket_node() const override {
-    return nullptr;
-  }
-
-  void SetOnDestroyDone(grpc_closure* on_destroy_done) override {
-    on_destroy_done_ = on_destroy_done;
-  }
-
-  void Orphan() override { Unref(); }
-
-  ~BinderServerListener() override {
-    ExecCtx::Get()->Flush();
-    if (on_destroy_done_) {
-      ExecCtx::Run(DEBUG_LOCATION, on_destroy_done_, absl::OkStatus());
-      ExecCtx::Get()->Flush();
-    }
-    grpc_remove_endpoint_binder(addr_);
-  }
-
- private:
-  absl::Status OnSetupTransport(transaction_code_t code,
-                                grpc_binder::ReadableParcel* parcel, int uid) {
-    ExecCtx exec_ctx;
-    if (static_cast<grpc_binder::BinderTransportTxCode>(code) !=
-        grpc_binder::BinderTransportTxCode::SETUP_TRANSPORT) {
-      return absl::InvalidArgumentError("Not a SETUP_TRANSPORT request");
-    }
-
-    LOG(INFO) << "BinderServerListener calling uid = " << uid;
-    if (!security_policy_->IsAuthorized(uid)) {
-      // TODO(mingcl): For now we just ignore this unauthorized
-      // SETUP_TRANSPORT transaction and ghost the client. Check if we should
-      // send back a SHUTDOWN_TRANSPORT in this case.
-      return absl::PermissionDeniedError(
-          "UID " + std::to_string(uid) +
-          " is not allowed to connect to this "
-          "server according to security policy.");
-    }
-
-    int version;
-    absl::Status status = parcel->ReadInt32(&version);
-    if (!status.ok()) {
-      return status;
-    }
-    LOG(INFO) << "BinderTransport client protocol version = " << version;
-    // TODO(mingcl): Make sure we only give client a version that is not newer
-    // than the version they specify. For now, we always tell client that we
-    // only support version=1.
-    std::unique_ptr<grpc_binder::Binder> client_binder{};
-    status = parcel->ReadBinder(&client_binder);
-    if (!status.ok()) {
-      return status;
-    }
-    if (!client_binder) {
-      return absl::InvalidArgumentError("NULL binder read from the parcel");
-    }
-    client_binder->Initialize();
-    // Finish the second half of SETUP_TRANSPORT in
-    // grpc_create_binder_transport_server().
-    Transport* server_transport = grpc_create_binder_transport_server(
-        std::move(client_binder), security_policy_);
-    CHECK(server_transport);
-    grpc_error_handle error = server_->SetupTransport(
-        server_transport, nullptr, server_->channel_args(), nullptr);
-    return grpc_error_to_absl_status(error);
-  }
-
-  Server* server_;
-  grpc_closure* on_destroy_done_ = nullptr;
-  std::string addr_;
-  BinderTxReceiverFactory factory_;
-  std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy_;
-  void* endpoint_binder_ = nullptr;
-  std::unique_ptr<grpc_binder::TransactionReceiver> tx_receiver_;
-};
-
-bool AddBinderPort(const std::string& addr, grpc_server* server,
-                   BinderTxReceiverFactory factory,
-                   std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-                       security_policy) {
-  // TODO(mingcl): Check if the addr is valid here after binder address resolver
-  // related code are merged.
-  const std::string kBinderUriScheme = "binder:";
-  if (addr.compare(0, kBinderUriScheme.size(), kBinderUriScheme) != 0) {
-    return false;
-  }
-  std::string conn_id = addr.substr(kBinderUriScheme.size());
-  Server* core_server = Server::FromC(server);
-  core_server->AddListener(MakeOrphanable<BinderServerListener>(
-      core_server, conn_id, std::move(factory), security_policy));
-  return true;
-}
-
-}  // namespace grpc_core
-#endif
diff --git a/src/core/ext/transport/binder/server/binder_server.h b/src/core/ext/transport/binder/server/binder_server.h
deleted file mode 100644
index 889a2555438..00000000000
--- a/src/core/ext/transport/binder/server/binder_server.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
-#include <string>
-
-#include "absl/container/flat_hash_map.h"
-#include "absl/status/status.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/transport/error_utils.h"
-#include "src/core/server/server.h"
-
-// TODO(waynetu): This is part of the public API and should be moved to the
-// include/ folder.
-namespace grpc {
-namespace experimental {
-namespace binder {
-
-void* GetEndpointBinder(const std::string& service);
-void AddEndpointBinder(const std::string& service, void* endpoint_binder);
-void RemoveEndpointBinder(const std::string& service);
-
-}  // namespace binder
-}  // namespace experimental
-}  // namespace grpc
-
-void grpc_add_endpoint_binder(const std::string& service,
-                              void* endpoint_binder);
-void grpc_remove_endpoint_binder(const std::string& service);
-void* grpc_get_endpoint_binder(const std::string& service);
-
-namespace grpc_core {
-
-// Consume a callback, produce a transaction listener. This is used to perform
-// testing in non-Android environments where the actual binder is not available.
-using BinderTxReceiverFactory =
-    std::function<std::unique_ptr<grpc_binder::TransactionReceiver>(
-        grpc_binder::TransactionReceiver::OnTransactCb)>;
-
-bool AddBinderPort(const std::string& addr, grpc_server* server,
-                   BinderTxReceiverFactory factory,
-                   std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-                       security_policy);
-
-}  // namespace grpc_core
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_SERVER_BINDER_SERVER_H
diff --git a/src/core/ext/transport/binder/server/binder_server_credentials.cc b/src/core/ext/transport/binder/server/binder_server_credentials.cc
deleted file mode 100644
index aea85fd82a6..00000000000
--- a/src/core/ext/transport/binder/server/binder_server_credentials.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#include "absl/log/check.h"
-
-#ifndef GRPC_NO_BINDER
-
-#include <grpcpp/security/binder_security_policy.h>
-#include <grpcpp/security/server_credentials.h>
-
-#include "src/core/ext/transport/binder/server/binder_server.h"
-#include "src/core/ext/transport/binder/wire_format/binder_android.h"
-
-namespace grpc {
-namespace experimental {
-
-namespace {
-
-class BinderServerCredentialsImpl final : public ServerCredentials {
- public:
-  explicit BinderServerCredentialsImpl(
-      std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-          security_policy)
-      : ServerCredentials(nullptr), security_policy_(security_policy) {}
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-  int AddPortToServer(const std::string& addr, grpc_server* server) override {
-    return grpc_core::AddBinderPort(
-        std::string(addr), server,
-        [](grpc_binder::TransactionReceiver::OnTransactCb transact_cb) {
-          return std::make_unique<grpc_binder::TransactionReceiverAndroid>(
-              nullptr, std::move(transact_cb));
-        },
-        security_policy_);
-  }
-#else
-  int AddPortToServer(const std::string& /*addr*/,
-                      grpc_server* /*server*/) override {
-    return 0;
-  }
-#endif  // GPR_SUPPORT_BINDER_TRANSPORT
-
- private:
-  std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy_;
-};
-
-}  // namespace
-
-std::shared_ptr<ServerCredentials> BinderServerCredentials(
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy) {
-  CHECK_NE(security_policy, nullptr);
-  return std::shared_ptr<ServerCredentials>(
-      new BinderServerCredentialsImpl(security_policy));
-}
-
-}  // namespace experimental
-}  // namespace grpc
-#endif
diff --git a/src/core/ext/transport/binder/transport/binder_stream.h b/src/core/ext/transport/binder/transport/binder_stream.h
deleted file mode 100644
index afd0c414514..00000000000
--- a/src/core/ext/transport/binder/transport/binder_stream.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-
-struct RecvInitialMetadataArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-  int tx_code;
-  absl::StatusOr<grpc_binder::Metadata> initial_metadata;
-};
-
-struct RecvMessageArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-  int tx_code;
-  absl::StatusOr<std::string> message;
-};
-
-struct RecvTrailingMetadataArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-  int tx_code;
-  absl::StatusOr<grpc_binder::Metadata> trailing_metadata;
-  int status;
-};
-
-struct RegisterStreamArgs {
-  grpc_binder_stream* stream;
-  grpc_binder_transport* transport;
-};
-
-// TODO(mingcl): Figure out if we want to use class instead of struct here
-struct grpc_binder_stream {
-  // server_data will be null for client, and for server it will be whatever
-  // passed in to the accept_stream_fn callback by client.
-  grpc_binder_stream(grpc_binder_transport* t, grpc_stream_refcount* refcount,
-                     const void* /*server_data*/, grpc_core::Arena* arena,
-                     int tx_code, bool is_client)
-      : t(t),
-        refcount(refcount),
-        arena(arena),
-        tx_code(tx_code),
-        is_client(is_client),
-        is_closed(false) {
-    recv_initial_metadata_args.stream = this;
-    recv_initial_metadata_args.transport = t;
-    recv_message_args.stream = this;
-    recv_message_args.transport = t;
-    recv_trailing_metadata_args.stream = this;
-    recv_trailing_metadata_args.transport = t;
-  }
-
-  ~grpc_binder_stream() {
-    if (destroy_stream_then_closure != nullptr) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, destroy_stream_then_closure,
-                              absl::OkStatus());
-    }
-  }
-
-  int GetTxCode() const { return tx_code; }
-
-  grpc_binder_transport* t;
-  grpc_stream_refcount* refcount;
-  grpc_core::Arena* arena;
-  int tx_code;
-  const bool is_client;
-  bool is_closed;
-
-  grpc_closure* destroy_stream_then_closure = nullptr;
-  grpc_closure destroy_stream;
-
-  // The reason why this stream is cancelled and closed.
-  grpc_error_handle cancel_self_error;
-
-  grpc_closure recv_initial_metadata_closure;
-  RecvInitialMetadataArgs recv_initial_metadata_args;
-  grpc_closure recv_message_closure;
-  RecvMessageArgs recv_message_args;
-  grpc_closure recv_trailing_metadata_closure;
-  RecvTrailingMetadataArgs recv_trailing_metadata_args;
-
-  grpc_closure register_stream_closure;
-  RegisterStreamArgs register_stream_args;
-
-  // We store these fields passed from op batch, in order to access them through
-  // grpc_binder_stream
-  grpc_metadata_batch* recv_initial_metadata;
-  grpc_closure* recv_initial_metadata_ready = nullptr;
-  bool* trailing_metadata_available = nullptr;
-  absl::optional<grpc_core::SliceBuffer>* recv_message;
-  grpc_closure* recv_message_ready = nullptr;
-  bool* call_failed_before_recv_message = nullptr;
-  grpc_metadata_batch* recv_trailing_metadata;
-  grpc_closure* recv_trailing_metadata_finished = nullptr;
-
-  bool trailing_metadata_sent = false;
-  bool need_to_call_trailing_metadata_callback = false;
-};
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_STREAM_H
diff --git a/src/core/ext/transport/binder/transport/binder_transport.cc b/src/core/ext/transport/binder/transport/binder_transport.cc
deleted file mode 100644
index aa0990f9ba2..00000000000
--- a/src/core/ext/transport/binder/transport/binder_transport.cc
+++ /dev/null
@@ -1,758 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/substitute.h"
-#include "src/core/ext/transport/binder/transport/binder_stream.h"
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-#include "src/core/lib/event_engine/default_event_engine.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/transport/error_utils.h"
-#include "src/core/lib/transport/metadata_batch.h"
-#include "src/core/lib/transport/transport.h"
-#include "src/core/util/crash.h"
-
-#ifndef NDEBUG
-static void grpc_binder_stream_ref(grpc_binder_stream* s, const char* reason) {
-  grpc_stream_ref(s->refcount, reason);
-}
-static void grpc_binder_stream_unref(grpc_binder_stream* s,
-                                     const char* reason) {
-  grpc_stream_unref(s->refcount, reason);
-}
-static void grpc_binder_ref_transport(grpc_binder_transport* t,
-                                      const char* reason, const char* file,
-                                      int line) {
-  t->refs.Ref(grpc_core::DebugLocation(file, line), reason);
-}
-static void grpc_binder_unref_transport(grpc_binder_transport* t,
-                                        const char* reason, const char* file,
-                                        int line) {
-  if (t->refs.Unref(grpc_core::DebugLocation(file, line), reason)) {
-    delete t;
-  }
-}
-#else
-static void grpc_binder_stream_ref(grpc_binder_stream* s) {
-  grpc_stream_ref(s->refcount);
-}
-static void grpc_binder_stream_unref(grpc_binder_stream* s) {
-  grpc_stream_unref(s->refcount);
-}
-static void grpc_binder_ref_transport(grpc_binder_transport* t) {
-  t->refs.Ref();
-}
-static void grpc_binder_unref_transport(grpc_binder_transport* t) {
-  if (t->refs.Unref()) {
-    delete t;
-  }
-}
-#endif
-
-#ifndef NDEBUG
-#define GRPC_BINDER_STREAM_REF(stream, reason) \
-  grpc_binder_stream_ref(stream, reason)
-#define GRPC_BINDER_STREAM_UNREF(stream, reason) \
-  grpc_binder_stream_unref(stream, reason)
-#define GRPC_BINDER_REF_TRANSPORT(t, r) \
-  grpc_binder_ref_transport(t, r, __FILE__, __LINE__)
-#define GRPC_BINDER_UNREF_TRANSPORT(t, r) \
-  grpc_binder_unref_transport(t, r, __FILE__, __LINE__)
-#else
-#define GRPC_BINDER_STREAM_REF(stream, reason) grpc_binder_stream_ref(stream)
-#define GRPC_BINDER_STREAM_UNREF(stream, reason) \
-  grpc_binder_stream_unref(stream)
-#define GRPC_BINDER_REF_TRANSPORT(t, r) grpc_binder_ref_transport(t)
-#define GRPC_BINDER_UNREF_TRANSPORT(t, r) grpc_binder_unref_transport(t)
-#endif
-
-static void register_stream_locked(void* arg, grpc_error_handle /*error*/) {
-  RegisterStreamArgs* args = static_cast<RegisterStreamArgs*>(arg);
-  args->transport->registered_stream[args->stream->GetTxCode()] = args->stream;
-}
-
-void grpc_binder_transport::InitStream(grpc_stream* gs,
-                                       grpc_stream_refcount* refcount,
-                                       const void* server_data,
-                                       grpc_core::Arena* arena) {
-  LOG(INFO) << __func__ << " = " << this << " " << gs << " " << refcount << " "
-            << server_data << " " << arena;
-  // Note that this function is not locked and may be invoked concurrently
-  new (gs) grpc_binder_stream(this, refcount, server_data, arena,
-                              NewStreamTxCode(), is_client);
-
-  // `grpc_binder_transport::registered_stream` should only be updated in
-  // combiner
-  grpc_binder_stream* stream = reinterpret_cast<grpc_binder_stream*>(gs);
-  stream->register_stream_args.stream = stream;
-  stream->register_stream_args.transport = this;
-  grpc_core::ExecCtx exec_ctx;
-  combiner->Run(GRPC_CLOSURE_INIT(&stream->register_stream_closure,
-                                  register_stream_locked,
-                                  &stream->register_stream_args, nullptr),
-                absl::OkStatus());
-}
-
-static void AssignMetadata(grpc_metadata_batch* mb,
-                           const grpc_binder::Metadata& md) {
-  mb->Clear();
-  for (auto& p : md) {
-    mb->Append(p.first, grpc_core::Slice::FromCopiedString(p.second),
-               [&](absl::string_view error, const grpc_core::Slice&) {
-                 VLOG(2) << "Failed to parse metadata: "
-                         << "key=" << p.first << " error=" << error;
-               });
-  }
-}
-
-static void cancel_stream_locked(grpc_binder_transport* transport,
-                                 grpc_binder_stream* stream,
-                                 grpc_error_handle error) {
-  LOG(INFO) << "cancel_stream_locked";
-  if (!stream->is_closed) {
-    CHECK(stream->cancel_self_error.ok());
-    stream->is_closed = true;
-    stream->cancel_self_error = error;
-    transport->transport_stream_receiver->CancelStream(stream->tx_code);
-    transport->registered_stream.erase(stream->tx_code);
-    if (stream->recv_initial_metadata_ready != nullptr) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION,
-                              stream->recv_initial_metadata_ready, error);
-      stream->recv_initial_metadata_ready = nullptr;
-      stream->recv_initial_metadata = nullptr;
-      stream->trailing_metadata_available = nullptr;
-    }
-    if (stream->recv_message_ready != nullptr) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream->recv_message_ready,
-                              error);
-      stream->recv_message_ready = nullptr;
-      stream->recv_message->reset();
-      stream->recv_message = nullptr;
-      stream->call_failed_before_recv_message = nullptr;
-    }
-    if (stream->recv_trailing_metadata_finished != nullptr) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION,
-                              stream->recv_trailing_metadata_finished, error);
-      stream->recv_trailing_metadata_finished = nullptr;
-      stream->recv_trailing_metadata = nullptr;
-    }
-  }
-}
-
-static bool ContainsAuthorityAndPath(const grpc_binder::Metadata& metadata) {
-  bool has_authority = false;
-  bool has_path = false;
-  for (const auto& kv : metadata) {
-    if (kv.first == ":authority") {
-      has_authority = true;
-    }
-    if (kv.first == ":path") {
-      has_path = true;
-    }
-  }
-  return has_authority && has_path;
-}
-
-static void recv_initial_metadata_locked(void* arg,
-                                         grpc_error_handle /*error*/) {
-  RecvInitialMetadataArgs* args = static_cast<RecvInitialMetadataArgs*>(arg);
-  grpc_binder_stream* stream = args->stream;
-
-  LOG(INFO) << "recv_initial_metadata_locked is_client = " << stream->is_client
-            << " is_closed = " << stream->is_closed;
-
-  if (!stream->is_closed) {
-    grpc_error_handle error = [&] {
-      CHECK(stream->recv_initial_metadata);
-      CHECK(stream->recv_initial_metadata_ready);
-      if (!args->initial_metadata.ok()) {
-        LOG(ERROR) << "Failed to parse initial metadata";
-        return absl_status_to_grpc_error(args->initial_metadata.status());
-      }
-      if (!stream->is_client) {
-        // For server, we expect :authority and :path in initial metadata.
-        if (!ContainsAuthorityAndPath(*args->initial_metadata)) {
-          return GRPC_ERROR_CREATE(
-              "Missing :authority or :path in initial metadata");
-        }
-      }
-      AssignMetadata(stream->recv_initial_metadata, *args->initial_metadata);
-      return absl::OkStatus();
-    }();
-    if (stream->t->registered_method_matcher_cb != nullptr) {
-      stream->t->registered_method_matcher_cb(
-          stream->t->accept_stream_user_data, stream->recv_initial_metadata);
-    }
-    grpc_closure* cb = stream->recv_initial_metadata_ready;
-    stream->recv_initial_metadata_ready = nullptr;
-    stream->recv_initial_metadata = nullptr;
-    grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error);
-  }
-  GRPC_BINDER_STREAM_UNREF(stream, "recv_initial_metadata");
-}
-
-static void recv_message_locked(void* arg, grpc_error_handle /*error*/) {
-  RecvMessageArgs* args = static_cast<RecvMessageArgs*>(arg);
-  grpc_binder_stream* stream = args->stream;
-
-  LOG(INFO) << "recv_message_locked is_client = " << stream->is_client
-            << " is_closed = " << stream->is_closed;
-
-  if (!stream->is_closed) {
-    grpc_error_handle error = [&] {
-      CHECK(stream->recv_message);
-      CHECK(stream->recv_message_ready);
-      if (!args->message.ok()) {
-        LOG(ERROR) << "Failed to receive message";
-        if (args->message.status().message() ==
-            grpc_binder::TransportStreamReceiver::
-                kGrpcBinderTransportCancelledGracefully) {
-          LOG(ERROR) << "message cancelled gracefully";
-          // Cancelled because we've already received trailing metadata.
-          // It's not an error in this case.
-          return absl::OkStatus();
-        } else {
-          return absl_status_to_grpc_error(args->message.status());
-        }
-      }
-      grpc_core::SliceBuffer buf;
-      buf.Append(grpc_core::Slice(grpc_slice_from_cpp_string(*args->message)));
-      *stream->recv_message = std::move(buf);
-      return absl::OkStatus();
-    }();
-
-    if (!error.ok() && stream->call_failed_before_recv_message != nullptr) {
-      *stream->call_failed_before_recv_message = true;
-    }
-    grpc_closure* cb = stream->recv_message_ready;
-    stream->recv_message_ready = nullptr;
-    stream->recv_message = nullptr;
-    grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error);
-  }
-
-  GRPC_BINDER_STREAM_UNREF(stream, "recv_message");
-}
-
-static void recv_trailing_metadata_locked(void* arg,
-                                          grpc_error_handle /*error*/) {
-  RecvTrailingMetadataArgs* args = static_cast<RecvTrailingMetadataArgs*>(arg);
-  grpc_binder_stream* stream = args->stream;
-
-  LOG(INFO) << "recv_trailing_metadata_locked is_client = " << stream->is_client
-            << " is_closed = " << stream->is_closed;
-
-  if (!stream->is_closed) {
-    grpc_error_handle error = [&] {
-      CHECK(stream->recv_trailing_metadata);
-      CHECK(stream->recv_trailing_metadata_finished);
-      if (!args->trailing_metadata.ok()) {
-        LOG(ERROR) << "Failed to receive trailing metadata";
-        return absl_status_to_grpc_error(args->trailing_metadata.status());
-      }
-      if (!stream->is_client) {
-        // Client will not send non-empty trailing metadata.
-        if (!args->trailing_metadata.value().empty()) {
-          LOG(ERROR) << "Server receives non-empty trailing metadata.";
-          return absl::CancelledError();
-        }
-      } else {
-        AssignMetadata(stream->recv_trailing_metadata,
-                       *args->trailing_metadata);
-        // Append status to metadata
-        // TODO(b/192208695): See if we can avoid to manually put status
-        // code into the header
-        LOG(INFO) << "status = " << args->status;
-        stream->recv_trailing_metadata->Set(
-            grpc_core::GrpcStatusMetadata(),
-            static_cast<grpc_status_code>(args->status));
-      }
-      return absl::OkStatus();
-    }();
-
-    if (stream->is_client || stream->trailing_metadata_sent) {
-      grpc_closure* cb = stream->recv_trailing_metadata_finished;
-      stream->recv_trailing_metadata_finished = nullptr;
-      stream->recv_trailing_metadata = nullptr;
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error);
-    } else {
-      // According to transport explaineer - "Server extra: This op shouldn't
-      // actually be considered complete until the server has also sent trailing
-      // metadata to provide the other side with final status"
-      //
-      // We haven't sent trailing metadata yet, so we have to delay completing
-      // the recv_trailing_metadata callback.
-      stream->need_to_call_trailing_metadata_callback = true;
-    }
-  }
-  GRPC_BINDER_STREAM_UNREF(stream, "recv_trailing_metadata");
-}
-
-namespace grpc_binder {
-namespace {
-
-class MetadataEncoder {
- public:
-  MetadataEncoder(bool is_client, Transaction* tx, Metadata* init_md)
-      : is_client_(is_client), tx_(tx), init_md_(init_md) {}
-
-  void Encode(const grpc_core::Slice& key_slice,
-              const grpc_core::Slice& value_slice) {
-    absl::string_view key = key_slice.as_string_view();
-    absl::string_view value = value_slice.as_string_view();
-    init_md_->emplace_back(std::string(key), std::string(value));
-  }
-
-  void Encode(grpc_core::HttpPathMetadata, const grpc_core::Slice& value) {
-    // TODO(b/192208403): Figure out if it is correct to simply drop '/'
-    // prefix and treat it as rpc method name
-    CHECK(value[0] == '/');
-    std::string path = std::string(value.as_string_view().substr(1));
-
-    // Only client send method ref.
-    CHECK(is_client_);
-    tx_->SetMethodRef(path);
-  }
-
-  void Encode(grpc_core::GrpcStatusMetadata, grpc_status_code status) {
-    LOG(INFO) << "send trailing metadata status = " << status;
-    tx_->SetStatus(status);
-  }
-
-  template <typename Trait>
-  void Encode(Trait, const typename Trait::ValueType& value) {
-    init_md_->emplace_back(std::string(Trait::key()),
-                           std::string(Trait::Encode(value).as_string_view()));
-  }
-
- private:
-  const bool is_client_;
-  Transaction* const tx_;
-  Metadata* const init_md_;
-};
-
-}  // namespace
-}  // namespace grpc_binder
-
-static void accept_stream_locked(void* gt, grpc_error_handle /*error*/) {
-  grpc_binder_transport* transport = static_cast<grpc_binder_transport*>(gt);
-  if (transport->accept_stream_fn) {
-    LOG(INFO) << "Accepting a stream";
-    // must pass in a non-null value.
-    (*transport->accept_stream_fn)(transport->accept_stream_user_data,
-                                   transport, transport);
-  } else {
-    ++transport->accept_stream_fn_called_count_;
-    LOG(INFO) << "accept_stream_fn not set, current count = "
-              << transport->accept_stream_fn_called_count_;
-  }
-}
-
-static void perform_stream_op_locked(void* stream_op,
-                                     grpc_error_handle /*error*/) {
-  grpc_transport_stream_op_batch* op =
-      static_cast<grpc_transport_stream_op_batch*>(stream_op);
-  grpc_binder_stream* stream =
-      static_cast<grpc_binder_stream*>(op->handler_private.extra_arg);
-  grpc_binder_transport* transport = stream->t;
-  if (op->cancel_stream) {
-    // TODO(waynetu): Is this true?
-    CHECK(!op->send_initial_metadata && !op->send_message &&
-          !op->send_trailing_metadata && !op->recv_initial_metadata &&
-          !op->recv_message && !op->recv_trailing_metadata);
-    LOG(INFO) << "cancel_stream is_client = " << stream->is_client;
-    if (!stream->is_client) {
-      // Send trailing metadata to inform the other end about the cancellation,
-      // regardless if we'd already done that or not.
-      auto cancel_tx = std::make_unique<grpc_binder::Transaction>(
-          stream->GetTxCode(), transport->is_client);
-      cancel_tx->SetSuffix(grpc_binder::Metadata{});
-      cancel_tx->SetStatus(1);
-      (void)transport->wire_writer->RpcCall(std::move(cancel_tx));
-    }
-    cancel_stream_locked(transport, stream,
-                         op->payload->cancel_stream.cancel_error);
-    if (op->on_complete != nullptr) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete,
-                              absl::OkStatus());
-    }
-    GRPC_BINDER_STREAM_UNREF(stream, "perform_stream_op");
-    return;
-  }
-
-  if (stream->is_closed) {
-    if (op->send_message) {
-      // Reset the send_message payload to prevent memory leaks.
-      op->payload->send_message.send_message->Clear();
-    }
-    if (op->recv_initial_metadata) {
-      grpc_core::ExecCtx::Run(
-          DEBUG_LOCATION,
-          op->payload->recv_initial_metadata.recv_initial_metadata_ready,
-          stream->cancel_self_error);
-    }
-    if (op->recv_message) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION,
-                              op->payload->recv_message.recv_message_ready,
-                              stream->cancel_self_error);
-    }
-    if (op->recv_trailing_metadata) {
-      grpc_core::ExecCtx::Run(
-          DEBUG_LOCATION,
-          op->payload->recv_trailing_metadata.recv_trailing_metadata_ready,
-          stream->cancel_self_error);
-    }
-    if (op->on_complete != nullptr) {
-      grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete,
-                              stream->cancel_self_error);
-    }
-    GRPC_BINDER_STREAM_UNREF(stream, "perform_stream_op");
-    return;
-  }
-
-  int tx_code = stream->tx_code;
-  auto tx =
-      std::make_unique<grpc_binder::Transaction>(tx_code, transport->is_client);
-
-  if (op->send_initial_metadata) {
-    LOG(INFO) << "send_initial_metadata";
-    grpc_binder::Metadata init_md;
-    auto batch = op->payload->send_initial_metadata.send_initial_metadata;
-
-    grpc_binder::MetadataEncoder encoder(transport->is_client, tx.get(),
-                                         &init_md);
-    batch->Encode(&encoder);
-    tx->SetPrefix(init_md);
-  }
-  if (op->send_message) {
-    LOG(INFO) << "send_message";
-    tx->SetData(op->payload->send_message.send_message->JoinIntoString());
-  }
-
-  if (op->send_trailing_metadata) {
-    LOG(INFO) << "send_trailing_metadata";
-    auto batch = op->payload->send_trailing_metadata.send_trailing_metadata;
-    grpc_binder::Metadata trailing_metadata;
-
-    grpc_binder::MetadataEncoder encoder(transport->is_client, tx.get(),
-                                         &trailing_metadata);
-    batch->Encode(&encoder);
-
-    // TODO(mingcl): Will we ever has key-value pair here? According to
-    // wireformat client suffix data is always empty.
-    tx->SetSuffix(trailing_metadata);
-  }
-  if (op->recv_initial_metadata) {
-    LOG(INFO) << "recv_initial_metadata";
-    stream->recv_initial_metadata_ready =
-        op->payload->recv_initial_metadata.recv_initial_metadata_ready;
-    stream->recv_initial_metadata =
-        op->payload->recv_initial_metadata.recv_initial_metadata;
-    stream->trailing_metadata_available =
-        op->payload->recv_initial_metadata.trailing_metadata_available;
-    GRPC_BINDER_STREAM_REF(stream, "recv_initial_metadata");
-    transport->transport_stream_receiver->RegisterRecvInitialMetadata(
-        tx_code, [tx_code, stream, transport](
-                     absl::StatusOr<grpc_binder::Metadata> initial_metadata) {
-          grpc_core::ExecCtx exec_ctx;
-          stream->recv_initial_metadata_args.tx_code = tx_code;
-          stream->recv_initial_metadata_args.initial_metadata =
-              std::move(initial_metadata);
-          transport->combiner->Run(
-              GRPC_CLOSURE_INIT(&stream->recv_initial_metadata_closure,
-                                recv_initial_metadata_locked,
-                                &stream->recv_initial_metadata_args, nullptr),
-              absl::OkStatus());
-        });
-  }
-  if (op->recv_message) {
-    LOG(INFO) << "recv_message";
-    stream->recv_message_ready = op->payload->recv_message.recv_message_ready;
-    stream->recv_message = op->payload->recv_message.recv_message;
-    stream->call_failed_before_recv_message =
-        op->payload->recv_message.call_failed_before_recv_message;
-    if (op->payload->recv_message.flags != nullptr) {
-      *op->payload->recv_message.flags = 0;
-    }
-    GRPC_BINDER_STREAM_REF(stream, "recv_message");
-    transport->transport_stream_receiver->RegisterRecvMessage(
-        tx_code,
-        [tx_code, stream, transport](absl::StatusOr<std::string> message) {
-          grpc_core::ExecCtx exec_ctx;
-          stream->recv_message_args.tx_code = tx_code;
-          stream->recv_message_args.message = std::move(message);
-          transport->combiner->Run(
-              GRPC_CLOSURE_INIT(&stream->recv_message_closure,
-                                recv_message_locked, &stream->recv_message_args,
-                                nullptr),
-              absl::OkStatus());
-        });
-  }
-  if (op->recv_trailing_metadata) {
-    LOG(INFO) << "recv_trailing_metadata";
-    stream->recv_trailing_metadata_finished =
-        op->payload->recv_trailing_metadata.recv_trailing_metadata_ready;
-    stream->recv_trailing_metadata =
-        op->payload->recv_trailing_metadata.recv_trailing_metadata;
-    GRPC_BINDER_STREAM_REF(stream, "recv_trailing_metadata");
-    transport->transport_stream_receiver->RegisterRecvTrailingMetadata(
-        tx_code, [tx_code, stream, transport](
-                     absl::StatusOr<grpc_binder::Metadata> trailing_metadata,
-                     int status) {
-          grpc_core::ExecCtx exec_ctx;
-          stream->recv_trailing_metadata_args.tx_code = tx_code;
-          stream->recv_trailing_metadata_args.trailing_metadata =
-              std::move(trailing_metadata);
-          stream->recv_trailing_metadata_args.status = status;
-          transport->combiner->Run(
-              GRPC_CLOSURE_INIT(&stream->recv_trailing_metadata_closure,
-                                recv_trailing_metadata_locked,
-                                &stream->recv_trailing_metadata_args, nullptr),
-              absl::OkStatus());
-        });
-  }
-  // Only send transaction when there's a send op presented.
-  absl::Status status;
-  if (op->send_initial_metadata || op->send_message ||
-      op->send_trailing_metadata) {
-    status = transport->wire_writer->RpcCall(std::move(tx));
-    if (!stream->is_client && op->send_trailing_metadata) {
-      stream->trailing_metadata_sent = true;
-      // According to transport explaineer - "Server extra: This op shouldn't
-      // actually be considered complete until the server has also sent trailing
-      // metadata to provide the other side with final status"
-      //
-      // Because we've done sending trailing metadata here, we can safely
-      // complete the recv_trailing_metadata callback here.
-      if (stream->need_to_call_trailing_metadata_callback) {
-        grpc_closure* cb = stream->recv_trailing_metadata_finished;
-        stream->recv_trailing_metadata_finished = nullptr;
-        grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, absl::OkStatus());
-        stream->need_to_call_trailing_metadata_callback = false;
-      }
-    }
-  }
-  // Note that this should only be scheduled when all non-recv ops are
-  // completed
-  if (op->on_complete != nullptr) {
-    grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_complete,
-                            absl_status_to_grpc_error(status));
-    LOG(INFO) << "on_complete closure scheduled";
-  }
-  GRPC_BINDER_STREAM_UNREF(stream, "perform_stream_op");
-}
-
-void grpc_binder_transport::PerformStreamOp(
-    grpc_stream* gs, grpc_transport_stream_op_batch* op) {
-  grpc_binder_stream* stream = reinterpret_cast<grpc_binder_stream*>(gs);
-  LOG(INFO) << __func__ << " = " << this << " " << gs << " " << op
-            << " is_client = " << stream->is_client;
-  GRPC_BINDER_STREAM_REF(stream, "perform_stream_op");
-  op->handler_private.extra_arg = stream;
-  combiner->Run(GRPC_CLOSURE_INIT(&op->handler_private.closure,
-                                  perform_stream_op_locked, op, nullptr),
-                absl::OkStatus());
-}
-
-static void close_transport_locked(grpc_binder_transport* transport) {
-  transport->state_tracker.SetState(
-      GRPC_CHANNEL_SHUTDOWN, absl::OkStatus(),
-      "transport closed due to disconnection/goaway");
-  while (!transport->registered_stream.empty()) {
-    cancel_stream_locked(
-        transport, transport->registered_stream.begin()->second,
-        grpc_error_set_int(GRPC_ERROR_CREATE("transport closed"),
-                           grpc_core::StatusIntProperty::kRpcStatus,
-                           GRPC_STATUS_UNAVAILABLE));
-  }
-}
-
-static void perform_transport_op_locked(void* transport_op,
-                                        grpc_error_handle /*error*/) {
-  grpc_transport_op* op = static_cast<grpc_transport_op*>(transport_op);
-  grpc_binder_transport* transport =
-      static_cast<grpc_binder_transport*>(op->handler_private.extra_arg);
-  // TODO(waynetu): Should we lock here to avoid data race?
-  if (op->start_connectivity_watch != nullptr) {
-    transport->state_tracker.AddWatcher(
-        op->start_connectivity_watch_state,
-        std::move(op->start_connectivity_watch));
-  }
-  if (op->stop_connectivity_watch != nullptr) {
-    transport->state_tracker.RemoveWatcher(op->stop_connectivity_watch);
-  }
-  if (op->set_accept_stream) {
-    transport->accept_stream_user_data = op->set_accept_stream_user_data;
-    transport->accept_stream_fn = op->set_accept_stream_fn;
-    transport->registered_method_matcher_cb =
-        op->set_registered_method_matcher_fn;
-    VLOG(2) << "accept_stream_fn_called_count_ = "
-            << transport->accept_stream_fn_called_count_;
-    while (transport->accept_stream_fn_called_count_ > 0) {
-      --transport->accept_stream_fn_called_count_;
-      transport->combiner->Run(
-          GRPC_CLOSURE_CREATE(accept_stream_locked, transport, nullptr),
-          absl::OkStatus());
-    }
-  }
-  if (op->on_consumed) {
-    grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, absl::OkStatus());
-  }
-  bool do_close = false;
-  if (!op->disconnect_with_error.ok()) {
-    do_close = true;
-  }
-  if (!op->goaway_error.ok()) {
-    do_close = true;
-  }
-  if (do_close) {
-    close_transport_locked(transport);
-  }
-  GRPC_BINDER_UNREF_TRANSPORT(transport, "perform_transport_op");
-}
-
-void grpc_binder_transport::PerformOp(grpc_transport_op* op) {
-  LOG(INFO) << __func__;
-  op->handler_private.extra_arg = this;
-  GRPC_BINDER_REF_TRANSPORT(this, "perform_transport_op");
-  combiner->Run(GRPC_CLOSURE_INIT(&op->handler_private.closure,
-                                  perform_transport_op_locked, op, nullptr),
-                absl::OkStatus());
-}
-
-static void destroy_stream_locked(void* sp, grpc_error_handle /*error*/) {
-  grpc_binder_stream* stream = static_cast<grpc_binder_stream*>(sp);
-  grpc_binder_transport* transport = stream->t;
-  cancel_stream_locked(
-      transport, stream,
-      grpc_error_set_int(GRPC_ERROR_CREATE("destroy stream"),
-                         grpc_core::StatusIntProperty::kRpcStatus,
-                         GRPC_STATUS_UNAVAILABLE));
-  stream->~grpc_binder_stream();
-}
-
-void grpc_binder_transport::DestroyStream(grpc_stream* gs,
-                                          grpc_closure* then_schedule_closure) {
-  LOG(INFO) << __func__;
-  grpc_binder_stream* stream = reinterpret_cast<grpc_binder_stream*>(gs);
-  stream->destroy_stream_then_closure = then_schedule_closure;
-  stream->t->combiner->Run(
-      GRPC_CLOSURE_INIT(&stream->destroy_stream, destroy_stream_locked, stream,
-                        nullptr),
-      absl::OkStatus());
-}
-
-static void destroy_transport_locked(void* gt, grpc_error_handle /*error*/) {
-  grpc_binder_transport* transport = static_cast<grpc_binder_transport*>(gt);
-  close_transport_locked(transport);
-  // Release the references held by the transport.
-  transport->wire_reader = nullptr;
-  transport->transport_stream_receiver = nullptr;
-  transport->wire_writer = nullptr;
-  GRPC_BINDER_UNREF_TRANSPORT(transport, "transport destroyed");
-}
-
-void grpc_binder_transport::Orphan() {
-  LOG(INFO) << __func__;
-  combiner->Run(GRPC_CLOSURE_CREATE(destroy_transport_locked, this, nullptr),
-                absl::OkStatus());
-}
-
-size_t grpc_binder_transport::SizeOfStream() const {
-  return sizeof(grpc_binder_stream);
-}
-
-grpc_binder_transport::grpc_binder_transport(
-    std::unique_ptr<grpc_binder::Binder> binder, bool is_client,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy)
-    : is_client(is_client),
-      combiner(grpc_combiner_create(
-          grpc_event_engine::experimental::GetDefaultEventEngine())),
-      state_tracker(
-          is_client ? "binder_transport_client" : "binder_transport_server",
-          GRPC_CHANNEL_READY),
-      refs(1, nullptr) {
-  LOG(INFO) << __func__;
-  transport_stream_receiver =
-      std::make_shared<grpc_binder::TransportStreamReceiverImpl>(
-          is_client, /*accept_stream_callback=*/[this] {
-            grpc_core::ExecCtx exec_ctx;
-            combiner->Run(
-                GRPC_CLOSURE_CREATE(accept_stream_locked, this, nullptr),
-                absl::OkStatus());
-          });
-  // WireReader holds a ref to grpc_binder_transport.
-  GRPC_BINDER_REF_TRANSPORT(this, "wire reader");
-  wire_reader = grpc_core::MakeOrphanable<grpc_binder::WireReaderImpl>(
-      transport_stream_receiver, is_client, security_policy,
-      // on_destruct_callback=
-      [this] {
-        // Unref transport when destructed.
-        GRPC_BINDER_UNREF_TRANSPORT(this, "wire reader");
-      });
-  wire_writer = wire_reader->SetupTransport(std::move(binder));
-}
-
-grpc_binder_transport::~grpc_binder_transport() {
-  GRPC_COMBINER_UNREF(combiner, "binder_transport");
-}
-
-grpc_core::Transport* grpc_create_binder_transport_client(
-    std::unique_ptr<grpc_binder::Binder> endpoint_binder,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy) {
-  LOG(INFO) << __func__;
-
-  CHECK(endpoint_binder != nullptr);
-  CHECK_NE(security_policy, nullptr);
-
-  grpc_binder_transport* t = new grpc_binder_transport(
-      std::move(endpoint_binder), /*is_client=*/true, security_policy);
-
-  return t;
-}
-
-grpc_core::Transport* grpc_create_binder_transport_server(
-    std::unique_ptr<grpc_binder::Binder> client_binder,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy) {
-  LOG(INFO) << __func__;
-
-  CHECK(client_binder != nullptr);
-  CHECK_NE(security_policy, nullptr);
-
-  grpc_binder_transport* t = new grpc_binder_transport(
-      std::move(client_binder), /*is_client=*/false, security_policy);
-
-  return t;
-}
-#endif
diff --git a/src/core/ext/transport/binder/transport/binder_transport.h b/src/core/ext/transport/binder/transport/binder_transport.h
deleted file mode 100644
index 1e5446c3fc1..00000000000
--- a/src/core/ext/transport/binder/transport/binder_transport.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
-#include <atomic>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/container/flat_hash_map.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-#include "src/core/lib/iomgr/combiner.h"
-#include "src/core/lib/transport/transport.h"
-#include "src/core/util/crash.h"
-
-struct grpc_binder_stream;
-
-// TODO(mingcl): Consider putting the struct in a namespace (Eventually this
-// depends on what style we want to follow)
-// TODO(mingcl): Decide casing for this class name. Should we use C-style class
-// name here or just go with C++ style?
-struct grpc_binder_transport final : public grpc_core::FilterStackTransport {
-  explicit grpc_binder_transport(
-      std::unique_ptr<grpc_binder::Binder> binder, bool is_client,
-      std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-          security_policy);
-  ~grpc_binder_transport() override;
-
-  grpc_core::FilterStackTransport* filter_stack_transport() override {
-    return this;
-  }
-  grpc_core::ClientTransport* client_transport() override { return nullptr; }
-  grpc_core::ServerTransport* server_transport() override { return nullptr; }
-  absl::string_view GetTransportName() const override { return "binder"; }
-  void InitStream(grpc_stream* gs, grpc_stream_refcount* refcount,
-                  const void* server_data, grpc_core::Arena* arena) override;
-  void SetPollset(grpc_stream*, grpc_pollset*) override {}
-  void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {}
-  void PerformOp(grpc_transport_op* op) override;
-  size_t SizeOfStream() const override;
-  bool HackyDisableStreamOpBatchCoalescingInConnectedChannel() const override {
-    return false;
-  }
-  void PerformStreamOp(grpc_stream* gs,
-                       grpc_transport_stream_op_batch* op) override;
-  void DestroyStream(grpc_stream* gs,
-                     grpc_closure* then_schedule_closure) override;
-  void Orphan() override;
-
-  int NewStreamTxCode() {
-    // TODO(mingcl): Wrap around when all tx codes are used. "If we do detect a
-    // collision however, we will fail the new call with UNAVAILABLE, and shut
-    // down the transport gracefully."
-    CHECK(next_free_tx_code <= LAST_CALL_TRANSACTION);
-    return next_free_tx_code++;
-  }
-
-  std::shared_ptr<grpc_binder::TransportStreamReceiver>
-      transport_stream_receiver;
-  grpc_core::OrphanablePtr<grpc_binder::WireReader> wire_reader;
-  std::shared_ptr<grpc_binder::WireWriter> wire_writer;
-
-  bool is_client;
-  // A set of currently registered streams (the key is the stream ID).
-  absl::flat_hash_map<int, grpc_binder_stream*> registered_stream;
-  grpc_core::Combiner* combiner;
-
-  // The callback and the data for the callback when the stream is connected
-  // between client and server. registered_method_matcher_cb is called before
-  // invoking the recv initial metadata callback.
-  void (*accept_stream_fn)(void* user_data, grpc_core::Transport* transport,
-                           const void* server_data) = nullptr;
-  void (*registered_method_matcher_cb)(
-      void* user_data, grpc_core::ServerMetadata* metadata) = nullptr;
-  void* accept_stream_user_data = nullptr;
-  // `accept_stream_locked()` could be called before `accept_stream_fn` has been
-  // set, we need to remember those requests that comes too early and call them
-  // later when we can.
-  int accept_stream_fn_called_count_{0};
-
-  grpc_core::ConnectivityStateTracker state_tracker;
-  grpc_core::RefCount refs;
-
- private:
-  std::atomic<int> next_free_tx_code{grpc_binder::kFirstCallId};
-};
-
-grpc_core::Transport* grpc_create_binder_transport_client(
-    std::unique_ptr<grpc_binder::Binder> endpoint_binder,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy);
-grpc_core::Transport* grpc_create_binder_transport_server(
-    std::unique_ptr<grpc_binder::Binder> client_binder,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-        security_policy);
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_TRANSPORT_BINDER_TRANSPORT_H
diff --git a/src/core/ext/transport/binder/utils/binder_auto_utils.h b/src/core/ext/transport/binder/utils/binder_auto_utils.h
deleted file mode 100644
index c72f7760761..00000000000
--- a/src/core/ext/transport/binder/utils/binder_auto_utils.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
-
-#include <grpc/support/port_platform.h>
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include "src/core/ext/transport/binder/utils/ndk_binder.h"
-
-namespace grpc_binder {
-namespace ndk_util {
-
-///
-/// Represents one strong pointer to an AIBinder object.
-/// Copied from binder/ndk/include_cpp/android/binder_auto_utils.h
-///
-class SpAIBinder {
- public:
-  SpAIBinder() : mBinder(nullptr) {}
-  explicit SpAIBinder(AIBinder* binder) : mBinder(binder) {}
-  SpAIBinder(std::nullptr_t)
-      : SpAIBinder() {}  // NOLINT(google-explicit-constructor)
-  SpAIBinder(const SpAIBinder& other) { *this = other; }
-
-  ~SpAIBinder() { set(nullptr); }
-  SpAIBinder& operator=(const SpAIBinder& other) {
-    if (this == &other) {
-      return *this;
-    }
-    AIBinder_incStrong(other.mBinder);
-    set(other.mBinder);
-    return *this;
-  }
-
-  void set(AIBinder* binder) {
-    AIBinder* old = *const_cast<AIBinder* volatile*>(&mBinder);
-    if (old != nullptr) AIBinder_decStrong(old);
-    if (old != *const_cast<AIBinder* volatile*>(&mBinder)) {
-      __assert(__FILE__, __LINE__, "Race detected.");
-    }
-    mBinder = binder;
-  }
-
-  AIBinder* get() const { return mBinder; }
-  AIBinder** getR() { return &mBinder; }
-
-  bool operator!=(const SpAIBinder& rhs) const { return get() != rhs.get(); }
-  bool operator<(const SpAIBinder& rhs) const { return get() < rhs.get(); }
-  bool operator<=(const SpAIBinder& rhs) const { return get() <= rhs.get(); }
-  bool operator==(const SpAIBinder& rhs) const { return get() == rhs.get(); }
-  bool operator>(const SpAIBinder& rhs) const { return get() > rhs.get(); }
-  bool operator>=(const SpAIBinder& rhs) const { return get() >= rhs.get(); }
-
- private:
-  AIBinder* mBinder = nullptr;
-};
-}  // namespace ndk_util
-}  // namespace grpc_binder
-
-#endif
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_BINDER_AUTO_UTILS_H
diff --git a/src/core/ext/transport/binder/utils/ndk_binder.cc b/src/core/ext/transport/binder/utils/ndk_binder.cc
deleted file mode 100644
index 8997255d7d7..00000000000
--- a/src/core/ext/transport/binder/utils/ndk_binder.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/utils/ndk_binder.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <dlfcn.h>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "src/core/util/crash.h"
-#include "src/core/util/sync.h"
-
-namespace {
-void* GetNdkBinderHandle() {
-  // TODO(mingcl): Consider using RTLD_NOLOAD to check if it is already loaded
-  // first
-  static void* handle = dlopen("libbinder_ndk.so", RTLD_LAZY);
-  if (handle == nullptr) {
-    LOG(ERROR) << "Cannot open libbinder_ndk.so. Does this device support API "
-                  "level 29?";
-    CHECK(0);
-  }
-  return handle;
-}
-
-JavaVM* g_jvm = nullptr;
-grpc_core::Mutex g_jvm_mu;
-
-// Whether the thread has already attached to JVM (this is to prevent
-// repeated attachment in `AttachJvm()`)
-thread_local bool g_is_jvm_attached = false;
-
-void SetJvm(JNIEnv* env) {
-  // OK to lock here since this function will only be called once for each
-  // connection.
-  grpc_core::MutexLock lock(&g_jvm_mu);
-  if (g_jvm != nullptr) {
-    return;
-  }
-  JavaVM* jvm = nullptr;
-  jint error = env->GetJavaVM(&jvm);
-  if (error != JNI_OK) {
-    LOG(ERROR) << "Failed to get JVM";
-  }
-  g_jvm = jvm;
-  LOG(INFO) << "JVM cached";
-}
-
-// `SetJvm` need to be called in the process before `AttachJvm`. This is always
-// the case because one of `AIBinder_fromJavaBinder`/`AIBinder_toJavaBinder`
-// will be called before we actually uses the binder. Return `false` if not able
-// to attach to JVM. Return `true` if JVM is attached (or already attached).
-bool AttachJvm() {
-  if (g_is_jvm_attached) {
-    return true;
-  }
-  // Note: The following code would be run at most once per thread.
-  grpc_core::MutexLock lock(&g_jvm_mu);
-  if (g_jvm == nullptr) {
-    LOG(ERROR) << "JVM not cached yet";
-    return false;
-  }
-  JNIEnv* env_unused;
-  // Note that attach a thread that is already attached is a no-op, so it is
-  // fine to call this again if the thread has already been attached by other.
-  g_jvm->AttachCurrentThread(&env_unused, /* thr_args= */ nullptr);
-  LOG(INFO) << "JVM attached successfully";
-  g_is_jvm_attached = true;
-  return true;
-}
-
-}  // namespace
-
-namespace grpc_binder {
-namespace ndk_util {
-
-// Helper macro to obtain the function pointer corresponding to the name
-#define FORWARD(name)                                                  \
-  typedef decltype(&name) func_type;                                   \
-  static func_type ptr =                                               \
-      reinterpret_cast<func_type>(dlsym(GetNdkBinderHandle(), #name)); \
-  if (ptr == nullptr) {                                                \
-    LOG(ERROR) << "dlsym failed. Cannot find " << #name                \
-               << " in libbinder_ndk.so. "                             \
-               << "BinderTransport requires API level >= 33";          \
-    CHECK(0);                                                          \
-  }                                                                    \
-  return ptr
-
-void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz) {
-  FORWARD(AIBinder_Class_disableInterfaceTokenHeader)(clazz);
-}
-
-void* AIBinder_getUserData(AIBinder* binder) {
-  FORWARD(AIBinder_getUserData)(binder);
-}
-
-uid_t AIBinder_getCallingUid() { FORWARD(AIBinder_getCallingUid)(); }
-
-AIBinder* AIBinder_fromJavaBinder(JNIEnv* env, jobject binder) {
-  SetJvm(env);
-  FORWARD(AIBinder_fromJavaBinder)(env, binder);
-}
-
-AIBinder_Class* AIBinder_Class_define(const char* interfaceDescriptor,
-                                      AIBinder_Class_onCreate onCreate,
-                                      AIBinder_Class_onDestroy onDestroy,
-                                      AIBinder_Class_onTransact onTransact) {
-  FORWARD(AIBinder_Class_define)
-  (interfaceDescriptor, onCreate, onDestroy, onTransact);
-}
-
-AIBinder* AIBinder_new(const AIBinder_Class* clazz, void* args) {
-  FORWARD(AIBinder_new)(clazz, args);
-}
-
-bool AIBinder_associateClass(AIBinder* binder, const AIBinder_Class* clazz) {
-  FORWARD(AIBinder_associateClass)(binder, clazz);
-}
-
-void AIBinder_incStrong(AIBinder* binder) {
-  FORWARD(AIBinder_incStrong)(binder);
-}
-
-void AIBinder_decStrong(AIBinder* binder) {
-  FORWARD(AIBinder_decStrong)(binder);
-}
-
-binder_status_t AIBinder_transact(AIBinder* binder, transaction_code_t code,
-                                  AParcel** in, AParcel** out,
-                                  binder_flags_t flags) {
-  if (!AttachJvm()) {
-    LOG(ERROR) << "failed to attach JVM. AIBinder_transact might fail.";
-  }
-  FORWARD(AIBinder_transact)(binder, code, in, out, flags);
-}
-
-binder_status_t AParcel_readByteArray(const AParcel* parcel, void* arrayData,
-                                      AParcel_byteArrayAllocator allocator) {
-  FORWARD(AParcel_readByteArray)(parcel, arrayData, allocator);
-}
-
-void AParcel_delete(AParcel* parcel) { FORWARD(AParcel_delete)(parcel); }
-int32_t AParcel_getDataSize(const AParcel* parcel) {
-  FORWARD(AParcel_getDataSize)(parcel);
-}
-
-binder_status_t AParcel_writeInt32(AParcel* parcel, int32_t value) {
-  FORWARD(AParcel_writeInt32)(parcel, value);
-}
-
-binder_status_t AParcel_writeInt64(AParcel* parcel, int64_t value) {
-  FORWARD(AParcel_writeInt64)(parcel, value);
-}
-
-binder_status_t AParcel_writeStrongBinder(AParcel* parcel, AIBinder* binder) {
-  FORWARD(AParcel_writeStrongBinder)(parcel, binder);
-}
-
-binder_status_t AParcel_writeString(AParcel* parcel, const char* string,
-                                    int32_t length) {
-  FORWARD(AParcel_writeString)(parcel, string, length);
-}
-
-binder_status_t AParcel_readInt32(const AParcel* parcel, int32_t* value) {
-  FORWARD(AParcel_readInt32)(parcel, value);
-}
-
-binder_status_t AParcel_readInt64(const AParcel* parcel, int64_t* value) {
-  FORWARD(AParcel_readInt64)(parcel, value);
-}
-
-binder_status_t AParcel_readString(const AParcel* parcel, void* stringData,
-                                   AParcel_stringAllocator allocator) {
-  FORWARD(AParcel_readString)(parcel, stringData, allocator);
-}
-
-binder_status_t AParcel_readStrongBinder(const AParcel* parcel,
-                                         AIBinder** binder) {
-  FORWARD(AParcel_readStrongBinder)(parcel, binder);
-}
-
-binder_status_t AParcel_writeByteArray(AParcel* parcel, const int8_t* arrayData,
-                                       int32_t length) {
-  FORWARD(AParcel_writeByteArray)(parcel, arrayData, length);
-}
-
-binder_status_t AIBinder_prepareTransaction(AIBinder* binder, AParcel** in) {
-  FORWARD(AIBinder_prepareTransaction)(binder, in);
-}
-
-jobject AIBinder_toJavaBinder(JNIEnv* env, AIBinder* binder) {
-  SetJvm(env);
-  FORWARD(AIBinder_toJavaBinder)(env, binder);
-}
-
-}  // namespace ndk_util
-}  // namespace grpc_binder
-
-#endif
-#endif
diff --git a/src/core/ext/transport/binder/utils/ndk_binder.h b/src/core/ext/transport/binder/utils/ndk_binder.h
deleted file mode 100644
index 1ca82c81625..00000000000
--- a/src/core/ext/transport/binder/utils/ndk_binder.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
-
-#include <grpc/support/port_platform.h>
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <assert.h>
-#include <jni.h>
-
-#include <memory>
-
-// This file defines NdkBinder functions, variables, and types in
-// grpc_binder::ndk_util namespace. This allows us to dynamically load
-// libbinder_ndk at runtime, and make it possible to compile the code without
-// the library present at compile time.
-
-// TODO(mingcl): Consider if we want to check API level and include NDK headers
-// normally if the level is high enough
-
-namespace grpc_binder {
-namespace ndk_util {
-
-struct AIBinder;
-struct AParcel;
-struct AIBinder_Class;
-
-// Only enum values used by the project is defined here
-enum {
-  FLAG_ONEWAY = 0x01,
-};
-enum {
-  STATUS_OK = 0,
-  STATUS_UNKNOWN_ERROR = (-2147483647 - 1),
-};
-
-typedef int32_t binder_status_t;
-typedef uint32_t binder_flags_t;
-typedef uint32_t transaction_code_t;
-
-typedef bool (*AParcel_byteArrayAllocator)(void* arrayData, int32_t length,
-                                           int8_t** outBuffer);
-typedef bool (*AParcel_stringAllocator)(void* stringData, int32_t length,
-                                        char** buffer);
-typedef void* (*AIBinder_Class_onCreate)(void* args);
-typedef void (*AIBinder_Class_onDestroy)(void* userData);
-typedef binder_status_t (*AIBinder_Class_onTransact)(AIBinder* binder,
-                                                     transaction_code_t code,
-                                                     const AParcel* in,
-                                                     AParcel* out);
-
-void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz);
-void* AIBinder_getUserData(AIBinder* binder);
-uid_t AIBinder_getCallingUid();
-AIBinder* AIBinder_fromJavaBinder(JNIEnv* env, jobject binder);
-AIBinder_Class* AIBinder_Class_define(const char* interfaceDescriptor,
-                                      AIBinder_Class_onCreate onCreate,
-                                      AIBinder_Class_onDestroy onDestroy,
-                                      AIBinder_Class_onTransact onTransact);
-AIBinder* AIBinder_new(const AIBinder_Class* clazz, void* args);
-bool AIBinder_associateClass(AIBinder* binder, const AIBinder_Class* clazz);
-void AIBinder_incStrong(AIBinder* binder);
-void AIBinder_decStrong(AIBinder* binder);
-binder_status_t AIBinder_transact(AIBinder* binder, transaction_code_t code,
-                                  AParcel** in, AParcel** out,
-                                  binder_flags_t flags);
-binder_status_t AParcel_readByteArray(const AParcel* parcel, void* arrayData,
-                                      AParcel_byteArrayAllocator allocator);
-void AParcel_delete(AParcel* parcel);
-int32_t AParcel_getDataSize(const AParcel* parcel);
-binder_status_t AParcel_writeInt32(AParcel* parcel, int32_t value);
-binder_status_t AParcel_writeInt64(AParcel* parcel, int64_t value);
-binder_status_t AParcel_writeStrongBinder(AParcel* parcel, AIBinder* binder);
-binder_status_t AParcel_writeString(AParcel* parcel, const char* string,
-                                    int32_t length);
-binder_status_t AParcel_readInt32(const AParcel* parcel, int32_t* value);
-binder_status_t AParcel_readInt64(const AParcel* parcel, int64_t* value);
-binder_status_t AParcel_readString(const AParcel* parcel, void* stringData,
-                                   AParcel_stringAllocator allocator);
-binder_status_t AParcel_readStrongBinder(const AParcel* parcel,
-                                         AIBinder** binder);
-binder_status_t AParcel_writeByteArray(AParcel* parcel, const int8_t* arrayData,
-                                       int32_t length);
-binder_status_t AIBinder_prepareTransaction(AIBinder* binder, AParcel** in);
-jobject AIBinder_toJavaBinder(JNIEnv* env, AIBinder* binder);
-
-}  // namespace ndk_util
-
-}  // namespace grpc_binder
-
-#endif  // GPR_SUPPORT_BINDER_TRANSPORT
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_NDK_BINDER_H
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver.h b/src/core/ext/transport/binder/utils/transport_stream_receiver.h
deleted file mode 100644
index a7f22d40c59..00000000000
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
-
-#include <grpc/support/port_platform.h>
-
-#include <functional>
-#include <string>
-#include <vector>
-
-#include "absl/status/statusor.h"
-#include "src/core/ext/transport/binder/wire_format/transaction.h"
-
-namespace grpc_binder {
-
-typedef int StreamIdentifier;
-
-class TransportStreamReceiver {
- public:
-  virtual ~TransportStreamReceiver() = default;
-
-  using InitialMetadataCallbackType =
-      std::function<void(absl::StatusOr<Metadata>)>;
-  using MessageDataCallbackType =
-      std::function<void(absl::StatusOr<std::string>)>;
-  using TrailingMetadataCallbackType =
-      std::function<void(absl::StatusOr<Metadata>, int)>;
-
-  // Only handles single time invocation. Callback object will be deleted.
-  // The callback should be valid until invocation or unregister.
-  virtual void RegisterRecvInitialMetadata(StreamIdentifier id,
-                                           InitialMetadataCallbackType cb) = 0;
-  virtual void RegisterRecvMessage(StreamIdentifier id,
-                                   MessageDataCallbackType cb) = 0;
-  virtual void RegisterRecvTrailingMetadata(
-      StreamIdentifier id, TrailingMetadataCallbackType cb) = 0;
-
-  // For the following functions, the second arguments are the transaction
-  // result received from the lower level. If it is None, that means there's
-  // something wrong when receiving the corresponding transaction. In such case,
-  // we should cancel the gRPC callback as well.
-  virtual void NotifyRecvInitialMetadata(
-      StreamIdentifier id, absl::StatusOr<Metadata> initial_metadata) = 0;
-  virtual void NotifyRecvMessage(StreamIdentifier id,
-                                 absl::StatusOr<std::string> message) = 0;
-  virtual void NotifyRecvTrailingMetadata(
-      StreamIdentifier id, absl::StatusOr<Metadata> trailing_metadata,
-      int status) = 0;
-  // Remove all entries associated with stream number `id`.
-  virtual void CancelStream(StreamIdentifier id) = 0;
-
-  static const absl::string_view kGrpcBinderTransportCancelledGracefully;
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_H
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
deleted file mode 100644
index af1f4071104..00000000000
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <functional>
-#include <string>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "src/core/util/crash.h"
-
-namespace grpc_binder {
-
-const absl::string_view
-    TransportStreamReceiver::kGrpcBinderTransportCancelledGracefully =
-        "grpc-binder-transport: cancelled gracefully";
-
-void TransportStreamReceiverImpl::RegisterRecvInitialMetadata(
-    StreamIdentifier id, InitialMetadataCallbackType cb) {
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  absl::StatusOr<Metadata> initial_metadata{};
-  {
-    grpc_core::MutexLock l(&m_);
-    CHECK_EQ(initial_metadata_cbs_.count(id), 0u);
-    auto iter = pending_initial_metadata_.find(id);
-    if (iter == pending_initial_metadata_.end()) {
-      if (trailing_metadata_recvd_.count(id)) {
-        cb(absl::CancelledError(""));
-      } else {
-        initial_metadata_cbs_[id] = std::move(cb);
-      }
-      cb = nullptr;
-    } else {
-      initial_metadata = std::move(iter->second.front());
-      iter->second.pop();
-      if (iter->second.empty()) {
-        pending_initial_metadata_.erase(iter);
-      }
-    }
-  }
-  if (cb != nullptr) {
-    cb(std::move(initial_metadata));
-  }
-}
-
-void TransportStreamReceiverImpl::RegisterRecvMessage(
-    StreamIdentifier id, MessageDataCallbackType cb) {
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  absl::StatusOr<std::string> message{};
-  {
-    grpc_core::MutexLock l(&m_);
-    CHECK_EQ(message_cbs_.count(id), 0u);
-    auto iter = pending_message_.find(id);
-    if (iter == pending_message_.end()) {
-      // If we'd already received trailing-metadata and there's no pending
-      // messages, cancel the callback.
-      if (trailing_metadata_recvd_.count(id)) {
-        cb(absl::CancelledError(
-            TransportStreamReceiver::kGrpcBinderTransportCancelledGracefully));
-      } else {
-        message_cbs_[id] = std::move(cb);
-      }
-      cb = nullptr;
-    } else {
-      // We'll still keep all pending messages received before the trailing
-      // metadata since they're issued before the end of stream, as promised by
-      // WireReader which keeps transactions commit in-order.
-      message = std::move(iter->second.front());
-      iter->second.pop();
-      if (iter->second.empty()) {
-        pending_message_.erase(iter);
-      }
-    }
-  }
-  if (cb != nullptr) {
-    cb(std::move(message));
-  }
-}
-
-void TransportStreamReceiverImpl::RegisterRecvTrailingMetadata(
-    StreamIdentifier id, TrailingMetadataCallbackType cb) {
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  std::pair<absl::StatusOr<Metadata>, int> trailing_metadata{};
-  {
-    grpc_core::MutexLock l(&m_);
-    CHECK_EQ(trailing_metadata_cbs_.count(id), 0u);
-    auto iter = pending_trailing_metadata_.find(id);
-    if (iter == pending_trailing_metadata_.end()) {
-      trailing_metadata_cbs_[id] = std::move(cb);
-      cb = nullptr;
-    } else {
-      trailing_metadata = std::move(iter->second.front());
-      iter->second.pop();
-      if (iter->second.empty()) {
-        pending_trailing_metadata_.erase(iter);
-      }
-    }
-  }
-  if (cb != nullptr) {
-    cb(std::move(trailing_metadata.first), trailing_metadata.second);
-  }
-}
-
-void TransportStreamReceiverImpl::NotifyRecvInitialMetadata(
-    StreamIdentifier id, absl::StatusOr<Metadata> initial_metadata) {
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  if (!is_client_ && accept_stream_callback_ && initial_metadata.ok()) {
-    accept_stream_callback_();
-  }
-  InitialMetadataCallbackType cb;
-  {
-    grpc_core::MutexLock l(&m_);
-    auto iter = initial_metadata_cbs_.find(id);
-    if (iter != initial_metadata_cbs_.end()) {
-      cb = iter->second;
-      initial_metadata_cbs_.erase(iter);
-    } else {
-      pending_initial_metadata_[id].push(std::move(initial_metadata));
-      return;
-    }
-  }
-  cb(std::move(initial_metadata));
-}
-
-void TransportStreamReceiverImpl::NotifyRecvMessage(
-    StreamIdentifier id, absl::StatusOr<std::string> message) {
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  MessageDataCallbackType cb;
-  {
-    grpc_core::MutexLock l(&m_);
-    auto iter = message_cbs_.find(id);
-    if (iter != message_cbs_.end()) {
-      cb = iter->second;
-      message_cbs_.erase(iter);
-    } else {
-      pending_message_[id].push(std::move(message));
-      return;
-    }
-  }
-  cb(std::move(message));
-}
-
-void TransportStreamReceiverImpl::NotifyRecvTrailingMetadata(
-    StreamIdentifier id, absl::StatusOr<Metadata> trailing_metadata,
-    int status) {
-  // Trailing metadata mark the end of the stream. Since TransportStreamReceiver
-  // assumes in-order commitments of transactions and that trailing metadata is
-  // parsed after message data, we can safely cancel all upcoming callbacks of
-  // recv_message.
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  OnRecvTrailingMetadata(id);
-  TrailingMetadataCallbackType cb;
-  {
-    grpc_core::MutexLock l(&m_);
-    auto iter = trailing_metadata_cbs_.find(id);
-    if (iter != trailing_metadata_cbs_.end()) {
-      cb = iter->second;
-      trailing_metadata_cbs_.erase(iter);
-    } else {
-      pending_trailing_metadata_[id].emplace(std::move(trailing_metadata),
-                                             status);
-      return;
-    }
-  }
-  cb(std::move(trailing_metadata), status);
-}
-
-void TransportStreamReceiverImpl::CancelInitialMetadataCallback(
-    StreamIdentifier id, absl::Status error) {
-  InitialMetadataCallbackType callback = nullptr;
-  {
-    grpc_core::MutexLock l(&m_);
-    auto iter = initial_metadata_cbs_.find(id);
-    if (iter != initial_metadata_cbs_.end()) {
-      callback = std::move(iter->second);
-      initial_metadata_cbs_.erase(iter);
-    }
-  }
-  if (callback != nullptr) {
-    std::move(callback)(error);
-  }
-}
-
-void TransportStreamReceiverImpl::CancelMessageCallback(StreamIdentifier id,
-                                                        absl::Status error) {
-  MessageDataCallbackType callback = nullptr;
-  {
-    grpc_core::MutexLock l(&m_);
-    auto iter = message_cbs_.find(id);
-    if (iter != message_cbs_.end()) {
-      callback = std::move(iter->second);
-      message_cbs_.erase(iter);
-    }
-  }
-  if (callback != nullptr) {
-    std::move(callback)(error);
-  }
-}
-
-void TransportStreamReceiverImpl::CancelTrailingMetadataCallback(
-    StreamIdentifier id, absl::Status error) {
-  TrailingMetadataCallbackType callback = nullptr;
-  {
-    grpc_core::MutexLock l(&m_);
-    auto iter = trailing_metadata_cbs_.find(id);
-    if (iter != trailing_metadata_cbs_.end()) {
-      callback = std::move(iter->second);
-      trailing_metadata_cbs_.erase(iter);
-    }
-  }
-  if (callback != nullptr) {
-    std::move(callback)(error, 0);
-  }
-}
-
-void TransportStreamReceiverImpl::OnRecvTrailingMetadata(StreamIdentifier id) {
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  m_.Lock();
-  trailing_metadata_recvd_.insert(id);
-  m_.Unlock();
-  CancelInitialMetadataCallback(id, absl::CancelledError(""));
-  CancelMessageCallback(
-      id,
-      absl::CancelledError(
-          TransportStreamReceiver::kGrpcBinderTransportCancelledGracefully));
-}
-
-void TransportStreamReceiverImpl::CancelStream(StreamIdentifier id) {
-  LOG(INFO) << __func__ << " id = " << id << " is_client = " << is_client_;
-  CancelInitialMetadataCallback(id, absl::CancelledError("Stream cancelled"));
-  CancelMessageCallback(id, absl::CancelledError("Stream cancelled"));
-  CancelTrailingMetadataCallback(id, absl::CancelledError("Stream cancelled"));
-  grpc_core::MutexLock l(&m_);
-  trailing_metadata_recvd_.erase(id);
-  pending_initial_metadata_.erase(id);
-  pending_message_.erase(id);
-  pending_trailing_metadata_.erase(id);
-}
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h b/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
deleted file mode 100644
index a5548aba89c..00000000000
--- a/src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
-
-#include <grpc/support/port_platform.h>
-
-#include <functional>
-#include <map>
-#include <queue>
-#include <set>
-#include <string>
-#include <vector>
-
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
-#include "src/core/util/sync.h"
-
-namespace grpc_binder {
-
-// Routes the data received from transport to corresponding streams
-class TransportStreamReceiverImpl : public TransportStreamReceiver {
- public:
-  explicit TransportStreamReceiverImpl(
-      bool is_client, std::function<void()> accept_stream_callback = nullptr)
-      : is_client_(is_client),
-        accept_stream_callback_(accept_stream_callback) {}
-  void RegisterRecvInitialMetadata(StreamIdentifier id,
-                                   InitialMetadataCallbackType cb) override;
-  void RegisterRecvMessage(StreamIdentifier id,
-                           MessageDataCallbackType cb) override;
-  void RegisterRecvTrailingMetadata(StreamIdentifier id,
-                                    TrailingMetadataCallbackType cb) override;
-  void NotifyRecvInitialMetadata(
-      StreamIdentifier id, absl::StatusOr<Metadata> initial_metadata) override;
-  void NotifyRecvMessage(StreamIdentifier id,
-                         absl::StatusOr<std::string> message) override;
-  void NotifyRecvTrailingMetadata(StreamIdentifier id,
-                                  absl::StatusOr<Metadata> trailing_metadata,
-                                  int status) override;
-
-  void CancelStream(StreamIdentifier id) override;
-
- private:
-  // Trailing metadata marks the end of one-side of the stream. Thus, after
-  // receiving trailing metadata from the other-end, we know that there will
-  // never be in-coming message data anymore, and all recv_message callbacks
-  // (as well as recv_initial_metadata callback, if there's any) registered will
-  // never be satisfied. This function cancels all such callbacks gracefully
-  // (with absl::OkStatus()) to avoid being blocked waiting for them.
-  void OnRecvTrailingMetadata(StreamIdentifier id);
-
-  void CancelInitialMetadataCallback(StreamIdentifier id, absl::Status error);
-  void CancelMessageCallback(StreamIdentifier id, absl::Status error);
-  void CancelTrailingMetadataCallback(StreamIdentifier id, absl::Status error);
-
-  std::map<StreamIdentifier, InitialMetadataCallbackType> initial_metadata_cbs_;
-  std::map<StreamIdentifier, MessageDataCallbackType> message_cbs_;
-  std::map<StreamIdentifier, TrailingMetadataCallbackType>
-      trailing_metadata_cbs_;
-  // TODO(waynetu): Better thread safety design. For example, use separate
-  // mutexes for different type of messages.
-  grpc_core::Mutex m_;
-  // TODO(waynetu): gRPC surface layer will not wait for the current message to
-  // be delivered before sending the next message. The following implementation
-  // is still buggy with the current implementation of wire writer if
-  // transaction issued first completes after the one issued later does. This is
-  // because we just take the first element out of the queue and assume it's the
-  // one issued first without further checking, which results in callbacks being
-  // invoked with incorrect data.
-  //
-  // This should be fixed in the wire writer level and make sure out-of-order
-  // messages will be re-ordered by it. In such case, the queueing approach will
-  // work fine. Refer to the TODO in WireWriterImpl::ProcessTransaction() at
-  // wire_reader_impl.cc for detecting and resolving out-of-order transactions.
-  //
-  // TODO(waynetu): Use absl::flat_hash_map.
-  std::map<StreamIdentifier, std::queue<absl::StatusOr<Metadata>>>
-      pending_initial_metadata_ ABSL_GUARDED_BY(m_);
-  std::map<StreamIdentifier, std::queue<absl::StatusOr<std::string>>>
-      pending_message_ ABSL_GUARDED_BY(m_);
-  std::map<StreamIdentifier,
-           std::queue<std::pair<absl::StatusOr<Metadata>, int>>>
-      pending_trailing_metadata_ ABSL_GUARDED_BY(m_);
-  // Record whether or not the recv_message callbacks of a given stream is
-  // cancelled. Although we explicitly cancel the registered recv_message() in
-  // CancelRecvMessageCallbacksDueToTrailingMetadata(), there are chances that
-  // the registration comes "after" we receive trailing metadata. Therefore,
-  // when RegisterRecvMessage() gets called, we should check whether
-  // recv_message_cancelled_ contains the corresponding stream ID, and if so,
-  // directly cancel the callback gracefully without pending it.
-  std::set<StreamIdentifier> trailing_metadata_recvd_ ABSL_GUARDED_BY(m_);
-
-  bool is_client_;
-  // Called when receiving initial metadata to inform the server about a new
-  // stream.
-  std::function<void()> accept_stream_callback_;
-};
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_UTILS_TRANSPORT_STREAM_RECEIVER_IMPL_H
diff --git a/src/core/ext/transport/binder/wire_format/binder.h b/src/core/ext/transport/binder/wire_format/binder.h
deleted file mode 100644
index 77ab16597e8..00000000000
--- a/src/core/ext/transport/binder/wire_format/binder.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
-
-#include <grpc/support/port_platform.h>
-
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <string>
-
-#include "absl/status/status.h"
-#include "absl/strings/string_view.h"
-#include "src/core/ext/transport/binder/wire_format/binder_constants.h"
-#include "src/core/util/orphanable.h"
-
-namespace grpc_binder {
-
-class HasRawBinder {
- public:
-  virtual ~HasRawBinder() = default;
-  virtual void* GetRawBinder() = 0;
-};
-
-class Binder;
-
-// TODO(waynetu): We might need other methods as well.
-// TODO(waynetu): Find a better way to express the returned status than
-// binder_status_t.
-class WritableParcel {
- public:
-  virtual ~WritableParcel() = default;
-  virtual int32_t GetDataSize() const = 0;
-  virtual absl::Status WriteInt32(int32_t data) = 0;
-  virtual absl::Status WriteInt64(int64_t data) = 0;
-  virtual absl::Status WriteBinder(HasRawBinder* binder) = 0;
-  virtual absl::Status WriteString(absl::string_view s) = 0;
-  virtual absl::Status WriteByteArray(const int8_t* buffer, int32_t length) = 0;
-
-  absl::Status WriteByteArrayWithLength(absl::string_view buffer) {
-    absl::Status status = WriteInt32(buffer.length());
-    if (!status.ok()) return status;
-    if (buffer.empty()) return absl::OkStatus();
-    return WriteByteArray(reinterpret_cast<const int8_t*>(buffer.data()),
-                          buffer.length());
-  }
-};
-
-// TODO(waynetu): We might need other methods as well.
-// TODO(waynetu): Find a better way to express the returned status than
-// binder_status_t.
-class ReadableParcel {
- public:
-  virtual ~ReadableParcel() = default;
-  virtual int32_t GetDataSize() const = 0;
-  virtual absl::Status ReadInt32(int32_t* data) = 0;
-  virtual absl::Status ReadInt64(int64_t* data) = 0;
-  virtual absl::Status ReadBinder(std::unique_ptr<Binder>* data) = 0;
-  virtual absl::Status ReadByteArray(std::string* data) = 0;
-  virtual absl::Status ReadString(std::string* str) = 0;
-};
-
-class TransactionReceiver : public HasRawBinder {
- public:
-  using OnTransactCb =
-      std::function<absl::Status(transaction_code_t, ReadableParcel*, int uid)>;
-
-  ~TransactionReceiver() override = default;
-};
-
-class WireReader;
-
-class Binder : public HasRawBinder {
- public:
-  ~Binder() override = default;
-
-  virtual void Initialize() = 0;
-  virtual absl::Status PrepareTransaction() = 0;
-  virtual absl::Status Transact(BinderTransportTxCode tx_code) = 0;
-
-  virtual WritableParcel* GetWritableParcel() const = 0;
-
-  // TODO(waynetu): Can we decouple the receiver from the binder?
-  virtual std::unique_ptr<TransactionReceiver> ConstructTxReceiver(
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      TransactionReceiver::OnTransactCb transact_cb) const = 0;
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_H
diff --git a/src/core/ext/transport/binder/wire_format/binder_android.cc b/src/core/ext/transport/binder/wire_format/binder_android.cc
deleted file mode 100644
index bc808e09bca..00000000000
--- a/src/core/ext/transport/binder/wire_format/binder_android.cc
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <map>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/strings/str_cat.h"
-#include "src/core/ext/transport/binder/wire_format/binder_android.h"
-#include "src/core/util/crash.h"
-#include "src/core/util/sync.h"
-
-namespace grpc_binder {
-namespace {
-
-struct BinderUserData {
-  explicit BinderUserData(grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-                          TransactionReceiver::OnTransactCb* callback)
-      : wire_reader_ref(wire_reader_ref), callback(callback) {}
-  grpc_core::RefCountedPtr<WireReader> wire_reader_ref;
-  TransactionReceiver::OnTransactCb* callback;
-};
-
-struct OnCreateArgs {
-  grpc_core::RefCountedPtr<WireReader> wire_reader_ref;
-  TransactionReceiver::OnTransactCb* callback;
-};
-
-void* f_onCreate_userdata(void* data) {
-  auto* args = static_cast<OnCreateArgs*>(data);
-  return new BinderUserData(args->wire_reader_ref, args->callback);
-}
-
-void f_onDestroy_delete(void* data) {
-  auto* user_data = static_cast<BinderUserData*>(data);
-  delete user_data;
-}
-
-void* f_onCreate_noop(void* /*args*/) { return nullptr; }
-void f_onDestroy_noop(void* /*userData*/) {}
-
-// TODO(mingcl): Consider if thread safety is a requirement here
-ndk_util::binder_status_t f_onTransact(ndk_util::AIBinder* binder,
-                                       transaction_code_t code,
-                                       const ndk_util::AParcel* in,
-                                       ndk_util::AParcel* /*out*/) {
-  LOG(INFO) << __func__;
-  LOG(INFO) << "tx code = " << code;
-
-  auto* user_data =
-      static_cast<BinderUserData*>(ndk_util::AIBinder_getUserData(binder));
-  TransactionReceiver::OnTransactCb* callback = user_data->callback;
-  // Wrap the parcel in a ReadableParcel.
-  std::unique_ptr<ReadableParcel> output =
-      std::make_unique<ReadableParcelAndroid>(in);
-  // The lock should be released "after" the callback finishes.
-  absl::Status status =
-      (*callback)(code, output.get(), ndk_util::AIBinder_getCallingUid());
-  if (status.ok()) {
-    return ndk_util::STATUS_OK;
-  } else {
-    LOG(ERROR) << "Callback failed: " << status.ToString();
-    return ndk_util::STATUS_UNKNOWN_ERROR;
-  }
-}
-
-// StdStringAllocator, ReadString, StdVectorAllocator, and ReadVector's
-// implementations are copied from android/binder_parcel_utils.h
-// We cannot include the header because it does not compile in C++11
-
-bool StdStringAllocator(void* stringData, int32_t length, char** buffer) {
-  if (length <= 0) return false;
-
-  std::string* str = static_cast<std::string*>(stringData);
-  str->resize(static_cast<size_t>(length) - 1);
-  *buffer = &(*str)[0];
-  return true;
-}
-
-ndk_util::binder_status_t AParcelReadString(const ndk_util::AParcel* parcel,
-                                            std::string* str) {
-  void* stringData = static_cast<void*>(str);
-  return ndk_util::AParcel_readString(parcel, stringData, StdStringAllocator);
-}
-
-template <typename T>
-bool StdVectorAllocator(void* vectorData, int32_t length, T** outBuffer) {
-  if (length < 0) return false;
-
-  std::vector<T>* vec = static_cast<std::vector<T>*>(vectorData);
-  if (static_cast<size_t>(length) > vec->max_size()) return false;
-
-  vec->resize(static_cast<size_t>(length));
-  *outBuffer = vec->data();
-  return true;
-}
-
-ndk_util::binder_status_t AParcelReadVector(const ndk_util::AParcel* parcel,
-                                            std::vector<uint8_t>* vec) {
-  void* vectorData = static_cast<void*>(vec);
-  return ndk_util::AParcel_readByteArray(parcel, vectorData,
-                                         StdVectorAllocator<int8_t>);
-}
-
-}  // namespace
-
-ndk_util::SpAIBinder FromJavaBinder(JNIEnv* jni_env, jobject binder) {
-  return ndk_util::SpAIBinder(
-      ndk_util::AIBinder_fromJavaBinder(jni_env, binder));
-}
-
-TransactionReceiverAndroid::TransactionReceiverAndroid(
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    OnTransactCb transact_cb)
-    : transact_cb_(transact_cb) {
-  // TODO(mingcl): For now interface descriptor is always empty, figure out if
-  // we want it to be something more meaningful (we can probably manually change
-  // interface descriptor by modifying Java code's reply to
-  // os.IBinder.INTERFACE_TRANSACTION)
-  ndk_util::AIBinder_Class* aibinder_class = ndk_util::AIBinder_Class_define(
-      /*interfaceDescriptor=*/"", f_onCreate_userdata, f_onDestroy_delete,
-      f_onTransact);
-
-  ndk_util::AIBinder_Class_disableInterfaceTokenHeader(aibinder_class);
-
-  // Pass the on-transact callback to the on-create function of the binder. The
-  // on-create function equips the callback with a mutex and gives it to the
-  // user data stored in the binder which can be retrieved later.
-  // Also Ref() (called implicitly by the copy constructor of RefCountedPtr) the
-  // wire reader so that it would not be destructed during the callback
-  // invocation.
-  OnCreateArgs args;
-  args.wire_reader_ref = wire_reader_ref;
-  args.callback = &transact_cb_;
-  binder_ = ndk_util::AIBinder_new(aibinder_class, &args);
-  CHECK(binder_);
-  LOG(INFO) << "ndk_util::AIBinder_associateClass = "
-            << ndk_util::AIBinder_associateClass(binder_, aibinder_class);
-}
-
-TransactionReceiverAndroid::~TransactionReceiverAndroid() {
-  // Release the binder.
-  ndk_util::AIBinder_decStrong(binder_);
-}
-
-namespace {
-
-ndk_util::binder_status_t f_onTransact_noop(ndk_util::AIBinder* /*binder*/,
-                                            transaction_code_t /*code*/,
-                                            const ndk_util::AParcel* /*in*/,
-                                            ndk_util::AParcel* /*out*/) {
-  return {};
-}
-
-void AssociateWithNoopClass(ndk_util::AIBinder* binder) {
-  // Need to associate class before using it
-  ndk_util::AIBinder_Class* aibinder_class = ndk_util::AIBinder_Class_define(
-      "", f_onCreate_noop, f_onDestroy_noop, f_onTransact_noop);
-
-  ndk_util::AIBinder_Class_disableInterfaceTokenHeader(aibinder_class);
-
-  LOG(INFO) << "ndk_util::AIBinder_associateClass = "
-            << ndk_util::AIBinder_associateClass(binder, aibinder_class);
-}
-
-}  // namespace
-
-void BinderAndroid::Initialize() {
-  ndk_util::AIBinder* binder = binder_.get();
-  AssociateWithNoopClass(binder);
-}
-
-absl::Status BinderAndroid::PrepareTransaction() {
-  ndk_util::AIBinder* binder = binder_.get();
-  return ndk_util::AIBinder_prepareTransaction(
-             binder, &input_parcel_->parcel_) == ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError(
-                   "ndk_util::AIBinder_prepareTransaction failed");
-}
-
-absl::Status BinderAndroid::Transact(BinderTransportTxCode tx_code) {
-  ndk_util::AIBinder* binder = binder_.get();
-  // We only do one-way transaction and thus the output parcel is never used.
-  ndk_util::AParcel* unused_output_parcel;
-  absl::Status result =
-      (ndk_util::AIBinder_transact(
-           binder, static_cast<transaction_code_t>(tx_code),
-           &input_parcel_->parcel_, &unused_output_parcel,
-           ndk_util::FLAG_ONEWAY) == ndk_util::STATUS_OK)
-          ? absl::OkStatus()
-          : absl::InternalError("ndk_util::AIBinder_transact failed");
-  ndk_util::AParcel_delete(unused_output_parcel);
-  return result;
-}
-
-std::unique_ptr<TransactionReceiver> BinderAndroid::ConstructTxReceiver(
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb transact_cb) const {
-  return std::make_unique<TransactionReceiverAndroid>(wire_reader_ref,
-                                                      transact_cb);
-}
-
-int32_t WritableParcelAndroid::GetDataSize() const {
-  return ndk_util::AParcel_getDataSize(parcel_);
-}
-
-absl::Status WritableParcelAndroid::WriteInt32(int32_t data) {
-  return ndk_util::AParcel_writeInt32(parcel_, data) == ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_writeInt32 failed");
-}
-
-absl::Status WritableParcelAndroid::WriteInt64(int64_t data) {
-  return ndk_util::AParcel_writeInt64(parcel_, data) == ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_writeInt64 failed");
-}
-
-absl::Status WritableParcelAndroid::WriteBinder(HasRawBinder* binder) {
-  return ndk_util::AParcel_writeStrongBinder(
-             parcel_, reinterpret_cast<ndk_util::AIBinder*>(
-                          binder->GetRawBinder())) == ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_writeStrongBinder failed");
-}
-
-absl::Status WritableParcelAndroid::WriteString(absl::string_view s) {
-  return ndk_util::AParcel_writeString(parcel_, s.data(), s.length()) ==
-                 ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_writeString failed");
-}
-
-absl::Status WritableParcelAndroid::WriteByteArray(const int8_t* buffer,
-                                                   int32_t length) {
-  return ndk_util::AParcel_writeByteArray(parcel_, buffer, length) ==
-                 ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_writeByteArray failed");
-}
-
-int32_t ReadableParcelAndroid::GetDataSize() const {
-  return ndk_util::AParcel_getDataSize(parcel_);
-}
-
-absl::Status ReadableParcelAndroid::ReadInt32(int32_t* data) {
-  return ndk_util::AParcel_readInt32(parcel_, data) == ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_readInt32 failed");
-}
-
-absl::Status ReadableParcelAndroid::ReadInt64(int64_t* data) {
-  return ndk_util::AParcel_readInt64(parcel_, data) == ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_readInt64 failed");
-}
-
-absl::Status ReadableParcelAndroid::ReadBinder(std::unique_ptr<Binder>* data) {
-  ndk_util::AIBinder* binder;
-  if (AParcel_readStrongBinder(parcel_, &binder) != ndk_util::STATUS_OK) {
-    *data = nullptr;
-    return absl::InternalError("AParcel_readStrongBinder failed");
-  }
-  *data = std::make_unique<BinderAndroid>(ndk_util::SpAIBinder(binder));
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelAndroid::ReadByteArray(std::string* data) {
-  std::vector<uint8_t> vec;
-  if (AParcelReadVector(parcel_, &vec) == ndk_util::STATUS_OK) {
-    data->resize(vec.size());
-    if (!vec.empty()) {
-      memcpy(&((*data)[0]), vec.data(), vec.size());
-    }
-    return absl::OkStatus();
-  }
-  return absl::InternalError("AParcel_readByteArray failed");
-}
-
-absl::Status ReadableParcelAndroid::ReadString(std::string* str) {
-  return AParcelReadString(parcel_, str) == ndk_util::STATUS_OK
-             ? absl::OkStatus()
-             : absl::InternalError("AParcel_readString failed");
-}
-
-}  // namespace grpc_binder
-
-#endif  // GPR_SUPPORT_BINDER_TRANSPORT
-#endif
diff --git a/src/core/ext/transport/binder/wire_format/binder_android.h b/src/core/ext/transport/binder/wire_format/binder_android.h
deleted file mode 100644
index 7d59a5fa00d..00000000000
--- a/src/core/ext/transport/binder/wire_format/binder_android.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_ANDROID_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_ANDROID_H
-
-#include <grpc/support/port_platform.h>
-
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-
-#include <jni.h>
-
-#include <memory>
-
-#include "absl/memory/memory.h"
-#include "src/core/ext/transport/binder/utils/binder_auto_utils.h"
-#include "src/core/ext/transport/binder/utils/ndk_binder.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-
-namespace grpc_binder {
-
-ndk_util::SpAIBinder FromJavaBinder(JNIEnv* jni_env, jobject binder);
-
-class BinderAndroid;
-
-class WritableParcelAndroid final : public WritableParcel {
- public:
-  WritableParcelAndroid() = default;
-  explicit WritableParcelAndroid(ndk_util::AParcel* parcel) : parcel_(parcel) {}
-  ~WritableParcelAndroid() override = default;
-
-  int32_t GetDataSize() const override;
-  absl::Status WriteInt32(int32_t data) override;
-  absl::Status WriteInt64(int64_t data) override;
-  absl::Status WriteBinder(HasRawBinder* binder) override;
-  absl::Status WriteString(absl::string_view s) override;
-  absl::Status WriteByteArray(const int8_t* buffer, int32_t length) override;
-
- private:
-  ndk_util::AParcel* parcel_ = nullptr;
-
-  friend class BinderAndroid;
-};
-
-class ReadableParcelAndroid final : public ReadableParcel {
- public:
-  ReadableParcelAndroid() = default;
-  // TODO(waynetu): Get rid of the const_cast.
-  explicit ReadableParcelAndroid(const ndk_util::AParcel* parcel)
-      : parcel_(parcel) {}
-  ~ReadableParcelAndroid() override = default;
-
-  int32_t GetDataSize() const override;
-  absl::Status ReadInt32(int32_t* data) override;
-  absl::Status ReadInt64(int64_t* data) override;
-  absl::Status ReadBinder(std::unique_ptr<Binder>* data) override;
-  absl::Status ReadByteArray(std::string* data) override;
-  absl::Status ReadString(std::string* str) override;
-
- private:
-  const ndk_util::AParcel* parcel_ = nullptr;
-
-  friend class BinderAndroid;
-};
-
-class BinderAndroid final : public Binder {
- public:
-  explicit BinderAndroid(ndk_util::SpAIBinder binder)
-      : binder_(binder),
-        input_parcel_(std::make_unique<WritableParcelAndroid>()) {}
-  ~BinderAndroid() override = default;
-
-  void* GetRawBinder() override { return binder_.get(); }
-
-  void Initialize() override;
-  absl::Status PrepareTransaction() override;
-  absl::Status Transact(BinderTransportTxCode tx_code) override;
-
-  WritableParcel* GetWritableParcel() const override {
-    return input_parcel_.get();
-  }
-
-  std::unique_ptr<TransactionReceiver> ConstructTxReceiver(
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      TransactionReceiver::OnTransactCb transact_cb) const override;
-
- private:
-  ndk_util::SpAIBinder binder_;
-  std::unique_ptr<WritableParcelAndroid> input_parcel_;
-};
-
-class TransactionReceiverAndroid final : public TransactionReceiver {
- public:
-  TransactionReceiverAndroid(
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      OnTransactCb transaction_cb);
-  ~TransactionReceiverAndroid() override;
-  void* GetRawBinder() override { return binder_; }
-
- private:
-  ndk_util::AIBinder* binder_;
-  OnTransactCb transact_cb_;
-};
-
-}  // namespace grpc_binder
-
-#endif  // GPR_SUPPORT_BINDER_TRANSPORT
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_ANDROID_H
diff --git a/src/core/ext/transport/binder/wire_format/binder_constants.cc b/src/core/ext/transport/binder/wire_format/binder_constants.cc
deleted file mode 100644
index e9b2439fc64..00000000000
--- a/src/core/ext/transport/binder/wire_format/binder_constants.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/ext/transport/binder/wire_format/binder_constants.h"
-
-ABSL_CONST_INIT const int FIRST_CALL_TRANSACTION = 0x00000001;
-ABSL_CONST_INIT const int LAST_CALL_TRANSACTION = 0x00FFFFFF;
-
-namespace grpc_binder {
-
-ABSL_CONST_INIT const int kFirstCallId = FIRST_CALL_TRANSACTION + 1000;
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/wire_format/binder_constants.h b/src/core/ext/transport/binder/wire_format/binder_constants.h
deleted file mode 100644
index 0dacaa742c0..00000000000
--- a/src/core/ext/transport/binder/wire_format/binder_constants.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
-
-#include <grpc/support/port_platform.h>
-
-#include <cstdint>
-
-#include "absl/base/attributes.h"
-
-using transaction_code_t = uint32_t;
-
-ABSL_CONST_INIT extern const int FIRST_CALL_TRANSACTION;
-ABSL_CONST_INIT extern const int LAST_CALL_TRANSACTION;
-
-namespace grpc_binder {
-
-enum class BinderTransportTxCode : int32_t {
-  SETUP_TRANSPORT = 1,
-  SHUTDOWN_TRANSPORT = 2,
-  ACKNOWLEDGE_BYTES = 3,
-  PING = 4,
-  PING_RESPONSE = 5,
-};
-
-ABSL_CONST_INIT extern const int kFirstCallId;
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_BINDER_CONSTANTS_H
diff --git a/src/core/ext/transport/binder/wire_format/transaction.cc b/src/core/ext/transport/binder/wire_format/transaction.cc
deleted file mode 100644
index 9c3bb0225b6..00000000000
--- a/src/core/ext/transport/binder/wire_format/transaction.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include "src/core/ext/transport/binder/wire_format/transaction.h"
-
-namespace grpc_binder {
-
-ABSL_CONST_INIT const int kFlagPrefix = 0x1;
-ABSL_CONST_INIT const int kFlagMessageData = 0x2;
-ABSL_CONST_INIT const int kFlagSuffix = 0x4;
-ABSL_CONST_INIT const int kFlagOutOfBandClose = 0x8;
-ABSL_CONST_INIT const int kFlagExpectSingleMessage = 0x10;
-ABSL_CONST_INIT const int kFlagStatusDescription = 0x20;
-ABSL_CONST_INIT const int kFlagMessageDataIsParcelable = 0x40;
-ABSL_CONST_INIT const int kFlagMessageDataIsPartial = 0x80;
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/wire_format/transaction.h b/src/core/ext/transport/binder/wire_format/transaction.h
deleted file mode 100644
index 0b22f8a60e9..00000000000
--- a/src/core/ext/transport/binder/wire_format/transaction.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
-
-#include <grpc/support/port_platform.h>
-
-#include <string>
-#include <vector>
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/strings/string_view.h"
-#include "src/core/util/crash.h"
-
-namespace grpc_binder {
-
-ABSL_CONST_INIT extern const int kFlagPrefix;
-ABSL_CONST_INIT extern const int kFlagMessageData;
-ABSL_CONST_INIT extern const int kFlagSuffix;
-ABSL_CONST_INIT extern const int kFlagOutOfBandClose;
-ABSL_CONST_INIT extern const int kFlagExpectSingleMessage;
-ABSL_CONST_INIT extern const int kFlagStatusDescription;
-ABSL_CONST_INIT extern const int kFlagMessageDataIsParcelable;
-ABSL_CONST_INIT extern const int kFlagMessageDataIsPartial;
-
-using Metadata = std::vector<std::pair<std::string, std::string>>;
-
-class Transaction {
- public:
-  Transaction(int tx_code, bool is_client)
-      : tx_code_(tx_code), is_client_(is_client) {}
-  // TODO(mingcl): Consider using string_view
-  void SetPrefix(Metadata prefix_metadata) {
-    prefix_metadata_ = prefix_metadata;
-    CHECK_EQ((flags_ & kFlagPrefix), 0);
-    flags_ |= kFlagPrefix;
-  }
-  void SetMethodRef(std::string method_ref) {
-    CHECK(is_client_);
-    method_ref_ = method_ref;
-  }
-  void SetData(std::string message_data) {
-    message_data_ = message_data;
-    CHECK_EQ((flags_ & kFlagMessageData), 0);
-    flags_ |= kFlagMessageData;
-  }
-  void SetSuffix(Metadata suffix_metadata) {
-    if (is_client_) CHECK(suffix_metadata.empty());
-    suffix_metadata_ = suffix_metadata;
-    CHECK_EQ((flags_ & kFlagSuffix), 0);
-    flags_ |= kFlagSuffix;
-  }
-  void SetStatusDescription(std::string status_desc) {
-    CHECK(!is_client_);
-    CHECK_EQ((flags_ & kFlagStatusDescription), 0);
-    status_desc_ = status_desc;
-  }
-  void SetStatus(int status) {
-    CHECK(!is_client_);
-    CHECK_EQ((flags_ >> 16), 0);
-    CHECK(status < (1 << 16));
-    flags_ |= (status << 16);
-  }
-
-  bool IsClient() const { return is_client_; }
-  bool IsServer() const { return !is_client_; }
-  int GetTxCode() const { return tx_code_; }
-  int GetFlags() const { return flags_; }
-
-  absl::string_view GetMethodRef() const { return method_ref_; }
-  const Metadata& GetPrefixMetadata() const { return prefix_metadata_; }
-  const Metadata& GetSuffixMetadata() const { return suffix_metadata_; }
-  absl::string_view GetMessageData() const { return message_data_; }
-  absl::string_view GetStatusDesc() const { return status_desc_; }
-
-  Transaction(const Transaction&) = delete;
-  void operator=(const Transaction&) = delete;
-
- private:
-  int tx_code_;
-  bool is_client_;
-  Metadata prefix_metadata_;
-  Metadata suffix_metadata_;
-  std::string method_ref_;
-  std::string message_data_;
-  std::string status_desc_;
-
-  int flags_ = 0;
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_TRANSACTION_H
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader.h b/src/core/ext/transport/binder/wire_format/wire_reader.h
deleted file mode 100644
index e446342af62..00000000000
--- a/src/core/ext/transport/binder/wire_format/wire_reader.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
-
-#include <grpc/support/port_platform.h>
-
-#include <memory>
-#include <utility>
-
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-#include "src/core/util/orphanable.h"
-
-namespace grpc_binder {
-
-class WireReader : public grpc_core::InternallyRefCounted<WireReader> {
- public:
-  ~WireReader() override = default;
-  virtual std::shared_ptr<WireWriter> SetupTransport(
-      std::unique_ptr<Binder> endpoint_binder) = 0;
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_H
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc b/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
deleted file mode 100644
index 5d8144650ac..00000000000
--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.cc
+++ /dev/null
@@ -1,450 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <functional>
-#include <limits>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/functional/any_invocable.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/memory/memory.h"
-#include "absl/status/statusor.h"
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-#include "src/core/util/crash.h"
-#include "src/core/util/status_helper.h"
-
-namespace grpc_binder {
-namespace {
-
-const int32_t kWireFormatVersion = 1;
-const char kAuthorityMetadataKey[] = ":authority";
-
-absl::StatusOr<Metadata> parse_metadata(ReadableParcel* reader) {
-  int num_header;
-  GRPC_RETURN_IF_ERROR(reader->ReadInt32(&num_header));
-  if (num_header < 0) {
-    return absl::InvalidArgumentError("num_header cannot be negative");
-  }
-  std::vector<std::pair<std::string, std::string>> ret;
-  for (int i = 0; i < num_header; i++) {
-    int count;
-    GRPC_RETURN_IF_ERROR(reader->ReadInt32(&count));
-    std::string key{};
-    if (count > 0) GRPC_RETURN_IF_ERROR(reader->ReadByteArray(&key));
-    GRPC_RETURN_IF_ERROR(reader->ReadInt32(&count));
-    std::string value{};
-    if (count > 0) GRPC_RETURN_IF_ERROR(reader->ReadByteArray(&value));
-    ret.emplace_back(key, value);
-  }
-  return ret;
-}
-
-}  // namespace
-
-WireReaderImpl::WireReaderImpl(
-    std::shared_ptr<TransportStreamReceiver> transport_stream_receiver,
-    bool is_client,
-    std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy,
-    std::function<void()> on_destruct_callback)
-    : transport_stream_receiver_(std::move(transport_stream_receiver)),
-      is_client_(is_client),
-      security_policy_(security_policy),
-      on_destruct_callback_(on_destruct_callback) {}
-
-WireReaderImpl::~WireReaderImpl() {
-  if (on_destruct_callback_) {
-    on_destruct_callback_();
-  }
-}
-
-std::shared_ptr<WireWriter> WireReaderImpl::SetupTransport(
-    std::unique_ptr<Binder> binder) {
-  if (!is_client_) {
-    connected_ = true;
-    SendSetupTransport(binder.get());
-    {
-      grpc_core::MutexLock lock(&mu_);
-      wire_writer_ = std::make_shared<WireWriterImpl>(std::move(binder));
-    }
-    wire_writer_ready_notification_.Notify();
-    return wire_writer_;
-  } else {
-    SendSetupTransport(binder.get());
-    auto other_end_binder = RecvSetupTransport();
-    {
-      grpc_core::MutexLock lock(&mu_);
-      connected_ = true;
-      wire_writer_ =
-          std::make_shared<WireWriterImpl>(std::move(other_end_binder));
-    }
-    wire_writer_ready_notification_.Notify();
-    return wire_writer_;
-  }
-}
-
-void WireReaderImpl::SendSetupTransport(Binder* binder) {
-  binder->Initialize();
-  const absl::Status prep_transaction_status = binder->PrepareTransaction();
-  VLOG(2) << "prepare transaction = " << prep_transaction_status;
-  WritableParcel* writable_parcel = binder->GetWritableParcel();
-  const absl::Status write_status =
-      writable_parcel->WriteInt32(kWireFormatVersion);
-  VLOG(2) << "write int32 = " << write_status;
-  // The lifetime of the transaction receiver is the same as the wire writer's.
-  // The transaction receiver is responsible for not calling the on-transact
-  // callback when it's dead.
-  // Give TransactionReceiver a Ref() since WireReader cannot be destructed
-  // during callback execution. TransactionReceiver should make sure that the
-  // callback owns a Ref() when it's being invoked.
-  tx_receiver_ = binder->ConstructTxReceiver(
-      /*wire_reader_ref=*/Ref(),
-      [this](transaction_code_t code, ReadableParcel* readable_parcel,
-             int uid) {
-        return this->ProcessTransaction(code, readable_parcel, uid);
-      });
-
-  VLOG(2) << "tx_receiver = " << tx_receiver_->GetRawBinder();
-  const absl::Status write_binder_status =
-      writable_parcel->WriteBinder(tx_receiver_.get());
-  VLOG(2) << "AParcel_writeStrongBinder = " << write_binder_status;
-  const absl::Status transact_status =
-      binder->Transact(BinderTransportTxCode::SETUP_TRANSPORT);
-  VLOG(2) << "AIBinder_transact = " << transact_status;
-}
-
-std::unique_ptr<Binder> WireReaderImpl::RecvSetupTransport() {
-  // TODO(b/191941760): avoid blocking, handle wire_writer_noti lifetime
-  // better
-  VLOG(2) << "start waiting for noti";
-  connection_noti_.WaitForNotification();
-  VLOG(2) << "end waiting for noti";
-  return std::move(other_end_binder_);
-}
-
-absl::Status WireReaderImpl::ProcessTransaction(transaction_code_t code,
-                                                ReadableParcel* parcel,
-                                                int uid) {
-  if (code >= static_cast<unsigned>(kFirstCallId)) {
-    return ProcessStreamingTransaction(code, parcel);
-  }
-
-  if (!(code >= static_cast<transaction_code_t>(
-                    BinderTransportTxCode::SETUP_TRANSPORT) &&
-        code <= static_cast<transaction_code_t>(
-                    BinderTransportTxCode::PING_RESPONSE))) {
-    LOG(INFO)
-        << "Received unknown control message. Shutdown transport gracefully.";
-    // TODO(waynetu): Shutdown transport gracefully.
-    return absl::OkStatus();
-  }
-
-  {
-    grpc_core::MutexLock lock(&mu_);
-    if (static_cast<BinderTransportTxCode>(code) !=
-            BinderTransportTxCode::SETUP_TRANSPORT &&
-        !connected_) {
-      return absl::InvalidArgumentError("Transports not connected yet");
-    }
-  }
-
-  // TODO(mingcl): See if we want to check the security policy for every RPC
-  // call or just during transport setup.
-
-  switch (static_cast<BinderTransportTxCode>(code)) {
-    case BinderTransportTxCode::SETUP_TRANSPORT: {
-      grpc_core::MutexLock lock(&mu_);
-      if (recvd_setup_transport_) {
-        return absl::InvalidArgumentError(
-            "Already received a SETUP_TRANSPORT request");
-      }
-      recvd_setup_transport_ = true;
-
-      VLOG(2) << "calling uid = " << uid;
-      if (!security_policy_->IsAuthorized(uid)) {
-        return absl::PermissionDeniedError(
-            "UID " + std::to_string(uid) +
-            " is not allowed to connect to this "
-            "transport according to security policy.");
-      }
-
-      int version;
-      GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&version));
-      VLOG(2) << "The other end respond with version = " << version;
-      // We only support this single lowest possible version, so server must
-      // respond that version too.
-      if (version != kWireFormatVersion) {
-        LOG(ERROR) << "The other end respond with version = " << version
-                   << ", but we requested version " << kWireFormatVersion
-                   << ", trying to continue anyway";
-      }
-      std::unique_ptr<Binder> binder{};
-      GRPC_RETURN_IF_ERROR(parcel->ReadBinder(&binder));
-      if (!binder) {
-        return absl::InternalError("Read NULL binder from the parcel");
-      }
-      binder->Initialize();
-      other_end_binder_ = std::move(binder);
-      connection_noti_.Notify();
-      break;
-    }
-    case BinderTransportTxCode::SHUTDOWN_TRANSPORT: {
-      LOG(ERROR)
-          << "Received SHUTDOWN_TRANSPORT request but not implemented yet.";
-      return absl::UnimplementedError("SHUTDOWN_TRANSPORT");
-    }
-    case BinderTransportTxCode::ACKNOWLEDGE_BYTES: {
-      int64_t num_bytes = -1;
-      GRPC_RETURN_IF_ERROR(parcel->ReadInt64(&num_bytes));
-      VLOG(2) << "received acknowledge bytes = " << num_bytes;
-      if (!wire_writer_ready_notification_.WaitForNotificationWithTimeout(
-              absl::Seconds(5))) {
-        return absl::DeadlineExceededError(
-            "wire_writer_ is not ready in time!");
-      }
-      wire_writer_->OnAckReceived(num_bytes);
-      break;
-    }
-    case BinderTransportTxCode::PING: {
-      if (is_client_) {
-        return absl::FailedPreconditionError("Receive PING request in client");
-      }
-      int ping_id = -1;
-      GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&ping_id));
-      VLOG(2) << "received ping id = " << ping_id;
-      // TODO(waynetu): Ping back.
-      break;
-    }
-    case BinderTransportTxCode::PING_RESPONSE: {
-      int value = -1;
-      GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&value));
-      VLOG(2) << "received ping response = " << value;
-      break;
-    }
-  }
-  return absl::OkStatus();
-}
-
-absl::Status WireReaderImpl::ProcessStreamingTransaction(
-    transaction_code_t code, ReadableParcel* parcel) {
-  bool need_to_send_ack = false;
-  int64_t num_bytes = 0;
-  // Indicates which callbacks should be cancelled. It will be initialized as
-  // the flags the in-coming transaction carries, and when a particular
-  // callback is completed, the corresponding bit in cancellation_flag will be
-  // set to 0 so that we won't cancel it afterward.
-  int cancellation_flags = 0;
-  // The queue saves the actions needed to be done "WITHOUT" `mu_`.
-  // It prevents deadlock against wire writer issues.
-  std::queue<absl::AnyInvocable<void() &&>> deferred_func_queue;
-  absl::Status tx_process_result;
-
-  {
-    grpc_core::MutexLock lock(&mu_);
-    if (!connected_) {
-      return absl::InvalidArgumentError("Transports not connected yet");
-    }
-
-    tx_process_result = ProcessStreamingTransactionImpl(
-        code, parcel, &cancellation_flags, deferred_func_queue);
-    if ((num_incoming_bytes_ - num_acknowledged_bytes_) >=
-        kFlowControlAckBytes) {
-      need_to_send_ack = true;
-      num_bytes = num_incoming_bytes_;
-      num_acknowledged_bytes_ = num_incoming_bytes_;
-    }
-  }
-  // Executes all actions in the queue.
-  while (!deferred_func_queue.empty()) {
-    std::move(deferred_func_queue.front())();
-    deferred_func_queue.pop();
-  }
-
-  if (!tx_process_result.ok()) {
-    LOG(ERROR) << "Failed to process streaming transaction: "
-               << tx_process_result.ToString();
-    // Something went wrong when receiving transaction. Cancel failed requests.
-    if (cancellation_flags & kFlagPrefix) {
-      LOG(INFO) << "cancelling initial metadata";
-      transport_stream_receiver_->NotifyRecvInitialMetadata(code,
-                                                            tx_process_result);
-    }
-    if (cancellation_flags & kFlagMessageData) {
-      LOG(INFO) << "cancelling message data";
-      transport_stream_receiver_->NotifyRecvMessage(code, tx_process_result);
-    }
-    if (cancellation_flags & kFlagSuffix) {
-      LOG(INFO) << "cancelling trailing metadata";
-      transport_stream_receiver_->NotifyRecvTrailingMetadata(
-          code, tx_process_result, 0);
-    }
-  }
-
-  if (need_to_send_ack) {
-    if (!wire_writer_ready_notification_.WaitForNotificationWithTimeout(
-            absl::Seconds(5))) {
-      return absl::DeadlineExceededError("wire_writer_ is not ready in time!");
-    }
-    CHECK(wire_writer_);
-    // wire_writer_ should not be accessed while holding mu_!
-    // Otherwise, it is possible that
-    // 1. wire_writer_::mu_ is acquired before mu_ (NDK call back during
-    // transaction)
-    // 2. mu_ is acquired before wire_writer_::mu_ (e.g. Java call back us, and
-    // we call WireWriter::SendAck which will try to acquire wire_writer_::mu_)
-    absl::Status ack_status = wire_writer_->SendAck(num_bytes);
-    if (tx_process_result.ok()) {
-      return ack_status;
-    }
-  }
-  return tx_process_result;
-}
-
-absl::Status WireReaderImpl::ProcessStreamingTransactionImpl(
-    transaction_code_t code, ReadableParcel* parcel, int* cancellation_flags,
-    std::queue<absl::AnyInvocable<void() &&>>& deferred_func_queue) {
-  CHECK(cancellation_flags);
-  num_incoming_bytes_ += parcel->GetDataSize();
-  LOG(INFO) << "Total incoming bytes: " << num_incoming_bytes_;
-
-  int flags;
-  GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&flags));
-  *cancellation_flags = flags;
-
-  // Ignore in-coming transaction with flag = 0 to match with Java
-  // implementation.
-  // TODO(waynetu): Check with grpc-java team to see whether this is the
-  // intended behavior.
-  // TODO(waynetu): What should be returned here?
-  if (flags == 0) {
-    LOG(INFO) << "[WARNING] Receive empty transaction. Ignored.";
-    return absl::OkStatus();
-  }
-
-  int status = flags >> 16;
-  VLOG(2) << "status = " << status;
-  VLOG(2) << "FLAG_PREFIX = " << (flags & kFlagPrefix);
-  VLOG(2) << "FLAG_MESSAGE_DATA = " << (flags & kFlagMessageData);
-  VLOG(2) << "FLAG_SUFFIX = " << (flags & kFlagSuffix);
-  int seq_num;
-  GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&seq_num));
-  // TODO(waynetu): For now we'll just assume that the transactions commit in
-  // the same order they're issued. The following assertion detects
-  // out-of-order or missing transactions. WireReaderImpl should be fixed if
-  // we indeed found such behavior.
-  int32_t& expectation = expected_seq_num_[code];
-  if (seq_num < 0 || seq_num != expectation) {
-    // Unexpected sequence number.
-    return absl::InternalError("Unexpected sequence number");
-  }
-  // TODO(waynetu): According to the protocol, "The sequence number will wrap
-  // around to 0 if more than 2^31 messages are sent." For now we'll just
-  // assert that it never reach such circumstances.
-  CHECK(expectation < std::numeric_limits<int32_t>::max())
-      << "Sequence number too large";
-  expectation++;
-  VLOG(2) << "sequence number = " << seq_num;
-  if (flags & kFlagPrefix) {
-    std::string method_ref;
-    if (!is_client_) {
-      GRPC_RETURN_IF_ERROR(parcel->ReadString(&method_ref));
-    }
-    absl::StatusOr<Metadata> initial_metadata_or_error = parse_metadata(parcel);
-    if (!initial_metadata_or_error.ok()) {
-      return initial_metadata_or_error.status();
-    }
-    if (!is_client_) {
-      // In BinderChannel wireformat specification, path is not encoded as part
-      // of metadata. So we extract the path and turn it into metadata here
-      // (this is what core API layer expects).
-      initial_metadata_or_error->emplace_back(":path",
-                                              std::string("/") + method_ref);
-      // Since authority metadata is not part of BinderChannel wireformat
-      // specification, and gRPC core API layer expects the presence of
-      // authority for message sent from client to server, we add one if
-      // missing (it will be missing if client grpc-java).
-      bool has_authority = false;
-      for (const auto& p : *initial_metadata_or_error) {
-        if (p.first == kAuthorityMetadataKey) has_authority = true;
-      }
-      if (!has_authority) {
-        initial_metadata_or_error->emplace_back(kAuthorityMetadataKey,
-                                                "binder.authority");
-      }
-    }
-    deferred_func_queue.emplace([this, code,
-                                 initial_metadata_or_error = std::move(
-                                     initial_metadata_or_error)]() mutable {
-      this->transport_stream_receiver_->NotifyRecvInitialMetadata(
-          code, std::move(initial_metadata_or_error));
-    });
-    *cancellation_flags &= ~kFlagPrefix;
-  }
-  if (flags & kFlagMessageData) {
-    int count;
-    GRPC_RETURN_IF_ERROR(parcel->ReadInt32(&count));
-    VLOG(2) << "count = " << count;
-    std::string msg_data{};
-    if (count > 0) {
-      GRPC_RETURN_IF_ERROR(parcel->ReadByteArray(&msg_data));
-    }
-    message_buffer_[code] += msg_data;
-    if ((flags & kFlagMessageDataIsPartial) == 0) {
-      std::string s = std::move(message_buffer_[code]);
-      message_buffer_.erase(code);
-      deferred_func_queue.emplace([this, code, s = std::move(s)]() mutable {
-        this->transport_stream_receiver_->NotifyRecvMessage(code, std::move(s));
-      });
-    }
-    *cancellation_flags &= ~kFlagMessageData;
-  }
-  if (flags & kFlagSuffix) {
-    if (flags & kFlagStatusDescription) {
-      // FLAG_STATUS_DESCRIPTION set
-      std::string desc;
-      GRPC_RETURN_IF_ERROR(parcel->ReadString(&desc));
-      VLOG(2) << "description = " << desc;
-    }
-    Metadata trailing_metadata;
-    if (is_client_) {
-      absl::StatusOr<Metadata> trailing_metadata_or_error =
-          parse_metadata(parcel);
-      if (!trailing_metadata_or_error.ok()) {
-        return trailing_metadata_or_error.status();
-      }
-      trailing_metadata = *trailing_metadata_or_error;
-    }
-    deferred_func_queue.emplace(
-        [this, code, trailing_metadata = std::move(trailing_metadata),
-         status]() mutable {
-          this->transport_stream_receiver_->NotifyRecvTrailingMetadata(
-              code, std::move(trailing_metadata), status);
-        });
-    *cancellation_flags &= ~kFlagSuffix;
-  }
-  return absl::OkStatus();
-}
-
-}  // namespace grpc_binder
-#endif
diff --git a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h b/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
deleted file mode 100644
index 8c8c4e939f7..00000000000
--- a/src/core/ext/transport/binder/wire_format/wire_reader_impl.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
-
-#include <grpc/support/port_platform.h>
-#include <grpcpp/security/binder_security_policy.h>
-
-#include <memory>
-#include <queue>
-#include <utility>
-
-#include "absl/container/flat_hash_map.h"
-#include "absl/functional/any_invocable.h"
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-#include "src/core/util/notification.h"
-
-namespace grpc_binder {
-
-class WireReaderImpl : public WireReader {
- public:
-  WireReaderImpl(
-      std::shared_ptr<TransportStreamReceiver> transport_stream_receiver,
-      bool is_client,
-      std::shared_ptr<grpc::experimental::binder::SecurityPolicy>
-          security_policy,
-      std::function<void()> on_destruct_callback = nullptr);
-  ~WireReaderImpl() override;
-
-  void Orphan() override { Unref(); }
-
-  /// Setup the transport between endpoint binders.
-  ///
-  /// The client and the server both call SetupTransport() when constructing
-  /// transport.
-  ///
-  /// High-level overview of transaction setup:
-  /// 0. Client obtains an |endpoint_binder| from the server (in the Android
-  /// setting, this can be achieved by "binding" to the server APK).
-  /// 1. Client creates a binder |client_binder| and hook its on-transaction
-  /// callback to client's ProcessTransaction(). Client then sends
-  /// |client_binder| through |endpoint_binder| to server.
-  /// 2. Server receives |client_binder| via |endpoint_binder|.
-  /// 3. Server creates a binder |server_binder| and hook its on-transaction
-  /// callback to server's ProcessTransaction(). Server then sends
-  /// |server_binder| through |client_binder| back to the client.
-  /// 4. Client receives |server_binder| via |client_binder|'s on-transaction
-  /// callback.
-  ///
-  /// The parameter \p binder here means different things for client nad server.
-  /// For client, \p binder refers to |endpoint_binder|, and for server, \p
-  /// binder refers to |client_binder|. That is, for server-side transport
-  /// setup, we assume that the first half of SETUP_TRANSPORT (up to step 2) is
-  /// already done somewhere else (see test/end2end/binder_transport_test.cc for
-  /// how it's handled in the testing environment).
-  std::shared_ptr<WireWriter> SetupTransport(
-      std::unique_ptr<Binder> binder) override;
-
-  absl::Status ProcessTransaction(transaction_code_t code,
-                                  ReadableParcel* parcel, int uid);
-
-  /// Send SETUP_TRANSPORT request through \p binder.
-  ///
-  /// This is the one half (for client it's the first half, and for server it's
-  /// the second) of the SETUP_TRANSPORT negotiation process. First, a new
-  /// binder is created. We take its "receiving" part and construct the
-  /// transaction receiver with it, and sends the "sending" part along with the
-  /// SETUP_TRANSPORT message through \p binder.
-  void SendSetupTransport(Binder* binder);
-
-  /// Recv SETUP_TRANSPORT request.
-  ///
-  /// This is the other half of the SETUP_TRANSPORT process. We wait for
-  /// in-coming SETUP_TRANSPORT request with the "sending" part of a binder from
-  /// the other end. For client, the message is coming from the transaction
-  /// receiver we just constructed in SendSetupTransport(). For server, we
-  /// assume that this step is already completed.
-  // TODO(waynetu): In the testing environment, we still use this method (on
-  // another WireReader instance) for server-side transport setup, and thus it
-  // is marked as public. Try moving this method back to private, and hopefully
-  // we can also avoid moving |other_end_binder_| out in the implementation.
-  std::unique_ptr<Binder> RecvSetupTransport();
-
- private:
-  absl::Status ProcessStreamingTransaction(transaction_code_t code,
-                                           ReadableParcel* parcel);
-  absl::Status ProcessStreamingTransactionImpl(
-      transaction_code_t code, ReadableParcel* parcel, int* cancellation_flags,
-      // The queue saves the actions needed to be done "WITHOUT" `mu_`.
-      // It prevents deadlock against wire writer issues.
-      std::queue<absl::AnyInvocable<void() &&>>& deferred_func_queue)
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
-
-  std::shared_ptr<TransportStreamReceiver> transport_stream_receiver_;
-  grpc_core::Notification connection_noti_;
-  grpc_core::Mutex mu_;
-  std::atomic_bool connected_{false};
-  bool recvd_setup_transport_ ABSL_GUARDED_BY(mu_) = false;
-  // NOTE: other_end_binder_ will be moved out when RecvSetupTransport() is
-  // called. Be cautious not to access it afterward.
-  std::unique_ptr<Binder> other_end_binder_;
-  absl::flat_hash_map<transaction_code_t, int32_t> expected_seq_num_
-      ABSL_GUARDED_BY(mu_);
-  absl::flat_hash_map<transaction_code_t, std::string> message_buffer_
-      ABSL_GUARDED_BY(mu_);
-  std::unique_ptr<TransactionReceiver> tx_receiver_;
-  bool is_client_;
-  std::shared_ptr<grpc::experimental::binder::SecurityPolicy> security_policy_;
-  // When WireReaderImpl gets destructed, call on_destruct_callback_. This is
-  // mostly for decrementing the reference count of its transport.
-  std::function<void()> on_destruct_callback_;
-
-  // ACK every 16k bytes.
-  static constexpr int64_t kFlowControlAckBytes = 16 * 1024;
-  int64_t num_incoming_bytes_ ABSL_GUARDED_BY(mu_) = 0;
-  int64_t num_acknowledged_bytes_ ABSL_GUARDED_BY(mu_) = 0;
-
-  // Used to send ACK.
-  std::shared_ptr<WireWriter> wire_writer_;
-
-  // Workaround for race condition.
-  //
-  // In `SetupTransport()`, we set `connected_` to true, call
-  // `SendSetupTransport()`, and construct `wire_writer_`. There is a potential
-  // race condition between calling `SendSetupTransport()` and constructing
-  // `wire_writer_`. So use this notification to wait. This should be very fast
-  // and waiting is acceptable.
-  //
-  // The original problem was that we can't move `connected_ = true` and
-  // `SendSetupTransport()` into the mutex, as it will deadlock if
-  // `ProcessTransaction()` is called in the same call chain.
-  //
-  // Note: this is not the perfect solution, the system will still deadlock if,
-  // e.g., the first request is 64K and we entered the sending ACK code path.
-  //
-  // TODO(littlecvr): Figure out a better solution to not causing any potential
-  // deadlock and not having to wait.
-  grpc_core::Notification wire_writer_ready_notification_;
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_READER_IMPL_H
diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.cc b/src/core/ext/transport/binder/wire_format/wire_writer.cc
deleted file mode 100644
index 948f16d2ee9..00000000000
--- a/src/core/ext/transport/binder/wire_format/wire_writer.cc
+++ /dev/null
@@ -1,393 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-
-#include <grpc/support/port_platform.h>
-
-#ifndef GRPC_NO_BINDER
-
-#include <utility>
-
-#include "absl/cleanup/cleanup.h"
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/types/variant.h"
-#include "src/core/lib/event_engine/default_event_engine.h"
-#include "src/core/util/crash.h"
-
-#define RETURN_IF_ERROR(expr)           \
-  do {                                  \
-    const absl::Status status = (expr); \
-    if (!status.ok()) return status;    \
-  } while (0)
-
-namespace grpc_binder {
-
-bool CanBeSentInOneTransaction(const Transaction& tx) {
-  return (tx.GetFlags() & kFlagMessageData) == 0 ||
-         static_cast<int64_t>(tx.GetMessageData().size()) <=
-             WireWriterImpl::kBlockSize;
-}
-
-// Simply forward the call to `WireWriterImpl::RunScheduledTx`.
-void RunScheduledTx(void* arg, grpc_error_handle /*error*/) {
-  auto* run_scheduled_tx_args =
-      static_cast<WireWriterImpl::RunScheduledTxArgs*>(arg);
-  run_scheduled_tx_args->writer->RunScheduledTxInternal(run_scheduled_tx_args);
-}
-
-absl::Status WriteInitialMetadata(const Transaction& tx,
-                                  WritableParcel* parcel) {
-  if (tx.IsClient()) {
-    // Only client sends method ref.
-    RETURN_IF_ERROR(parcel->WriteString(tx.GetMethodRef()));
-  }
-  RETURN_IF_ERROR(parcel->WriteInt32(tx.GetPrefixMetadata().size()));
-  for (const auto& md : tx.GetPrefixMetadata()) {
-    RETURN_IF_ERROR(parcel->WriteByteArrayWithLength(md.first));
-    RETURN_IF_ERROR(parcel->WriteByteArrayWithLength(md.second));
-  }
-  return absl::OkStatus();
-}
-
-absl::Status WriteTrailingMetadata(const Transaction& tx,
-                                   WritableParcel* parcel) {
-  if (tx.IsServer()) {
-    if (tx.GetFlags() & kFlagStatusDescription) {
-      RETURN_IF_ERROR(parcel->WriteString(tx.GetStatusDesc()));
-    }
-    RETURN_IF_ERROR(parcel->WriteInt32(tx.GetSuffixMetadata().size()));
-    for (const auto& md : tx.GetSuffixMetadata()) {
-      RETURN_IF_ERROR(parcel->WriteByteArrayWithLength(md.first));
-      RETURN_IF_ERROR(parcel->WriteByteArrayWithLength(md.second));
-    }
-  } else {
-    // client suffix currently is always empty according to the wireformat
-    if (!tx.GetSuffixMetadata().empty()) {
-      LOG(ERROR) << "Got non-empty suffix metadata from client.";
-    }
-  }
-  return absl::OkStatus();
-}
-
-WireWriterImpl::WireWriterImpl(std::unique_ptr<Binder> binder)
-    : binder_(std::move(binder)),
-      combiner_(grpc_combiner_create(
-          grpc_event_engine::experimental::GetDefaultEventEngine())) {}
-
-WireWriterImpl::~WireWriterImpl() {
-  GRPC_COMBINER_UNREF(combiner_, "wire_writer_impl");
-  while (!pending_outgoing_tx_.empty()) {
-    delete pending_outgoing_tx_.front();
-    pending_outgoing_tx_.pop();
-  }
-}
-
-// Flow control constant are specified at
-// https://github.com/grpc/proposal/blob/master/L73-java-binderchannel/wireformat.md#flow-control
-const int64_t WireWriterImpl::kBlockSize = 16 * 1024;
-const int64_t WireWriterImpl::kFlowControlWindowSize = 128 * 1024;
-
-absl::Status WireWriterImpl::MakeBinderTransaction(
-    BinderTransportTxCode tx_code,
-    std::function<absl::Status(WritableParcel*)> fill_parcel) {
-  grpc_core::MutexLock lock(&write_mu_);
-  RETURN_IF_ERROR(binder_->PrepareTransaction());
-  WritableParcel* parcel = binder_->GetWritableParcel();
-  RETURN_IF_ERROR(fill_parcel(parcel));
-  // Only stream transaction is accounted in flow control spec.
-  if (static_cast<int32_t>(tx_code) >= kFirstCallId) {
-    int64_t parcel_size = parcel->GetDataSize();
-    if (parcel_size > 2 * kBlockSize) {
-      LOG(ERROR) << "Unexpected large transaction (possibly caused by a very "
-                    "large metadata). This might overflow the binder "
-                    "transaction buffer. Size: "
-                 << parcel_size << " bytes";
-    }
-    num_outgoing_bytes_ += parcel_size;
-    LOG(INFO) << "Total outgoing bytes: " << num_outgoing_bytes_.load();
-  }
-  CHECK(!is_transacting_);
-  is_transacting_ = true;
-  absl::Status result = binder_->Transact(tx_code);
-  is_transacting_ = false;
-  return result;
-}
-
-absl::Status WireWriterImpl::RpcCallFastPath(std::unique_ptr<Transaction> tx) {
-  return MakeBinderTransaction(
-      static_cast<BinderTransportTxCode>(tx->GetTxCode()),
-      [this, tx = tx.get()](
-          WritableParcel* parcel) ABSL_EXCLUSIVE_LOCKS_REQUIRED(write_mu_) {
-        RETURN_IF_ERROR(parcel->WriteInt32(tx->GetFlags()));
-        RETURN_IF_ERROR(parcel->WriteInt32(next_seq_num_[tx->GetTxCode()]++));
-        if (tx->GetFlags() & kFlagPrefix) {
-          RETURN_IF_ERROR(WriteInitialMetadata(*tx, parcel));
-        }
-        if (tx->GetFlags() & kFlagMessageData) {
-          RETURN_IF_ERROR(
-              parcel->WriteByteArrayWithLength(tx->GetMessageData()));
-        }
-        if (tx->GetFlags() & kFlagSuffix) {
-          RETURN_IF_ERROR(WriteTrailingMetadata(*tx, parcel));
-        }
-        return absl::OkStatus();
-      });
-}
-
-absl::Status WireWriterImpl::RunStreamTx(
-    RunScheduledTxArgs::StreamTx* stream_tx, WritableParcel* parcel,
-    bool* is_last_chunk) {
-  Transaction* tx = stream_tx->tx.get();
-  // Transaction without data flag should go to fast path.
-  CHECK(tx->GetFlags() & kFlagMessageData);
-
-  absl::string_view data = tx->GetMessageData();
-  CHECK(stream_tx->bytes_sent <= static_cast<int64_t>(data.size()));
-
-  int flags = kFlagMessageData;
-
-  if (stream_tx->bytes_sent == 0) {
-    // This is the first transaction. Include initial
-    // metadata if there's any.
-    if (tx->GetFlags() & kFlagPrefix) {
-      flags |= kFlagPrefix;
-    }
-  }
-  // There is also prefix/suffix in transaction beside the transaction data so
-  // actual transaction size will be greater than `kBlockSize`. This is
-  // unavoidable because we cannot split the prefix metadata and trailing
-  // metadata into different binder transactions. In most cases this is fine
-  // because single transaction size is not required to be strictly lower than
-  // `kBlockSize`, as long as it won't overflow Android's binder buffer.
-  int64_t size = std::min<int64_t>(WireWriterImpl::kBlockSize,
-                                   data.size() - stream_tx->bytes_sent);
-  if (stream_tx->bytes_sent + WireWriterImpl::kBlockSize >=
-      static_cast<int64_t>(data.size())) {
-    // This is the last transaction. Include trailing
-    // metadata if there's any.
-    if (tx->GetFlags() & kFlagSuffix) {
-      flags |= kFlagSuffix;
-    }
-    size = data.size() - stream_tx->bytes_sent;
-    *is_last_chunk = true;
-  } else {
-    // There are more messages to send.
-    flags |= kFlagMessageDataIsPartial;
-    *is_last_chunk = false;
-  }
-  RETURN_IF_ERROR(parcel->WriteInt32(flags));
-  RETURN_IF_ERROR(parcel->WriteInt32(next_seq_num_[tx->GetTxCode()]++));
-  if (flags & kFlagPrefix) {
-    RETURN_IF_ERROR(WriteInitialMetadata(*tx, parcel));
-  }
-  RETURN_IF_ERROR(parcel->WriteByteArrayWithLength(
-      data.substr(stream_tx->bytes_sent, size)));
-  if (flags & kFlagSuffix) {
-    RETURN_IF_ERROR(WriteTrailingMetadata(*tx, parcel));
-  }
-  stream_tx->bytes_sent += size;
-  return absl::OkStatus();
-}
-
-void WireWriterImpl::RunScheduledTxInternal(RunScheduledTxArgs* args) {
-  CHECK(args->writer == this);
-  if (absl::holds_alternative<RunScheduledTxArgs::AckTx>(args->tx)) {
-    int64_t num_bytes =
-        absl::get<RunScheduledTxArgs::AckTx>(args->tx).num_bytes;
-    absl::Status result =
-        MakeBinderTransaction(BinderTransportTxCode::ACKNOWLEDGE_BYTES,
-                              [num_bytes](WritableParcel* parcel) {
-                                RETURN_IF_ERROR(parcel->WriteInt64(num_bytes));
-                                return absl::OkStatus();
-                              });
-    if (!result.ok()) {
-      LOG(ERROR) << "Failed to make binder transaction " << result;
-    }
-    delete args;
-    return;
-  }
-  CHECK(absl::holds_alternative<RunScheduledTxArgs::StreamTx>(args->tx));
-  RunScheduledTxArgs::StreamTx* stream_tx =
-      &absl::get<RunScheduledTxArgs::StreamTx>(args->tx);
-  // Be reservative. Decrease CombinerTxCount after the data size of this
-  // transaction has already been added to `num_outgoing_bytes_`, to make sure
-  // we never underestimate `num_outgoing_bytes_`.
-  auto decrease_combiner_tx_count = absl::MakeCleanup([this]() {
-    {
-      grpc_core::MutexLock lock(&flow_control_mu_);
-      CHECK_GT(num_non_acked_tx_in_combiner_, 0);
-      num_non_acked_tx_in_combiner_--;
-    }
-    // New transaction might be ready to be scheduled.
-    TryScheduleTransaction();
-  });
-  if (CanBeSentInOneTransaction(*stream_tx->tx.get())) {  // NOLINT
-    absl::Status result = RpcCallFastPath(std::move(stream_tx->tx));
-    if (!result.ok()) {
-      LOG(ERROR) << "Failed to handle non-chunked RPC call " << result;
-    }
-    delete args;
-    return;
-  }
-  bool is_last_chunk = true;
-  absl::Status result = MakeBinderTransaction(
-      static_cast<BinderTransportTxCode>(stream_tx->tx->GetTxCode()),
-      [stream_tx, &is_last_chunk, this](WritableParcel* parcel)
-          ABSL_EXCLUSIVE_LOCKS_REQUIRED(write_mu_) {
-            return RunStreamTx(stream_tx, parcel, &is_last_chunk);
-          });
-  if (!result.ok()) {
-    LOG(ERROR) << "Failed to make binder transaction " << result;
-  }
-  if (!is_last_chunk) {
-    {
-      grpc_core::MutexLock lock(&flow_control_mu_);
-      pending_outgoing_tx_.push(args);
-    }
-    TryScheduleTransaction();
-  } else {
-    delete args;
-  }
-}
-
-absl::Status WireWriterImpl::RpcCall(std::unique_ptr<Transaction> tx) {
-  // TODO(mingcl): check tx_code <= last call id
-  CHECK(tx->GetTxCode() >= kFirstCallId);
-  auto args = new RunScheduledTxArgs();
-  args->writer = this;
-  args->tx = RunScheduledTxArgs::StreamTx();
-  absl::get<RunScheduledTxArgs::StreamTx>(args->tx).tx = std::move(tx);
-  absl::get<RunScheduledTxArgs::StreamTx>(args->tx).bytes_sent = 0;
-  {
-    grpc_core::MutexLock lock(&flow_control_mu_);
-    pending_outgoing_tx_.push(args);
-  }
-  TryScheduleTransaction();
-  return absl::OkStatus();
-}
-
-absl::Status WireWriterImpl::SendAck(int64_t num_bytes) {
-  // Ensure combiner will be run if this is not called from top-level gRPC API
-  // entrypoint.
-  grpc_core::ExecCtx exec_ctx;
-  LOG(INFO) << "Ack " << num_bytes << " bytes received";
-  if (is_transacting_) {
-    // This can happen because NDK might call our registered callback function
-    // in the same thread while we are telling it to send a transaction
-    // `is_transacting_` will be true. `Binder::Transact` is now being called on
-    // the same thread or the other thread. We are currently in the call stack
-    // of other transaction, Liveness of ACK is still guaranteed even if this is
-    // a race with another thread.
-    LOG(INFO) << "Scheduling ACK transaction instead of directly execute it to "
-                 "avoid deadlock.";
-    auto args = new RunScheduledTxArgs();
-    args->writer = this;
-    args->tx = RunScheduledTxArgs::AckTx();
-    absl::get<RunScheduledTxArgs::AckTx>(args->tx).num_bytes = num_bytes;
-    auto cl = GRPC_CLOSURE_CREATE(RunScheduledTx, args, nullptr);
-    combiner_->Run(cl, absl::OkStatus());
-    return absl::OkStatus();
-  }
-  // Otherwise, we can directly send ack.
-  absl::Status result =
-      MakeBinderTransaction((BinderTransportTxCode::ACKNOWLEDGE_BYTES),
-                            [num_bytes](WritableParcel* parcel) {
-                              RETURN_IF_ERROR(parcel->WriteInt64(num_bytes));
-                              return absl::OkStatus();
-                            });
-  if (!result.ok()) {
-    LOG(ERROR) << "Failed to make binder transaction " << result;
-  }
-  return result;
-}
-
-void WireWriterImpl::OnAckReceived(int64_t num_bytes) {
-  // Ensure combiner will be run if this is not called from top-level gRPC API
-  // entrypoint.
-  grpc_core::ExecCtx exec_ctx;
-  LOG(INFO) << "OnAckReceived " << num_bytes;
-  // Do not try to obtain `write_mu_` in this function. NDKBinder might invoke
-  // the callback to notify us about new incoming binder transaction when we are
-  // sending transaction. i.e. `write_mu_` might have already been acquired by
-  // this thread.
-  {
-    grpc_core::MutexLock lock(&flow_control_mu_);
-    num_acknowledged_bytes_ = std::max(num_acknowledged_bytes_, num_bytes);
-    int64_t num_outgoing_bytes = num_outgoing_bytes_;
-    if (num_acknowledged_bytes_ > num_outgoing_bytes) {
-      LOG(ERROR) << "The other end of transport acked more bytes than we ever "
-                    "sent, "
-                 << num_acknowledged_bytes_ << " > " << num_outgoing_bytes;
-    }
-  }
-  TryScheduleTransaction();
-}
-
-void WireWriterImpl::TryScheduleTransaction() {
-  while (true) {
-    grpc_core::MutexLock lock(&flow_control_mu_);
-    if (pending_outgoing_tx_.empty()) {
-      // Nothing to be schduled.
-      break;
-    }
-    // Number of bytes we have scheduled in combiner but have not yet be
-    // executed by combiner. Here we make an assumption that every binder
-    // transaction will take `kBlockSize`. This should be close to truth when a
-    // large message is being cut to `kBlockSize` chunks.
-    int64_t num_bytes_scheduled_in_combiner =
-        num_non_acked_tx_in_combiner_ * kBlockSize;
-    // An estimation of number of bytes of traffic we will eventually send to
-    // the other end, assuming all tasks in combiner will be executed and we
-    // receive no new ACK from the other end of transport.
-    int64_t num_total_bytes_will_be_sent =
-        num_outgoing_bytes_ + num_bytes_scheduled_in_combiner;
-    // An estimation of number of bytes of traffic that will not be
-    // acknowledged, assuming all tasks in combiner will be executed and we
-    // receive no new ack message fomr the other end of transport.
-    int64_t num_non_acked_bytes_estimation =
-        num_total_bytes_will_be_sent - num_acknowledged_bytes_;
-    if (num_non_acked_bytes_estimation < 0) {
-      LOG(ERROR) << "Something went wrong. `num_non_acked_bytes_estimation` "
-                    "should be non-negative but it is "
-                 << num_non_acked_bytes_estimation;
-    }
-    // If we can schedule another transaction (which has size estimation of
-    // `kBlockSize`) without exceeding `kFlowControlWindowSize`, schedule it.
-    if ((num_non_acked_bytes_estimation + kBlockSize <
-         kFlowControlWindowSize)) {
-      num_non_acked_tx_in_combiner_++;
-      combiner_->Run(GRPC_CLOSURE_CREATE(RunScheduledTx,
-                                         pending_outgoing_tx_.front(), nullptr),
-                     absl::OkStatus());
-      pending_outgoing_tx_.pop();
-    } else {
-      // It is common to fill `kFlowControlWindowSize` completely because
-      // transactions are send at faster rate than the other end of transport
-      // can handle it, so here we use VLOG(2).
-      VLOG(2) << "Some work cannot be scheduled yet due to slow ack from the "
-                 "other end of transport. This transport might be blocked if "
-                 "this number don't go down. pending_outgoing_tx_.size() = "
-              << pending_outgoing_tx_.size()
-              << " pending_outgoing_tx_.front() = "
-              << pending_outgoing_tx_.front();
-      break;
-    }
-  }
-}
-
-}  // namespace grpc_binder
-
-#endif
diff --git a/src/core/ext/transport/binder/wire_format/wire_writer.h b/src/core/ext/transport/binder/wire_format/wire_writer.h
deleted file mode 100644
index 81848296323..00000000000
--- a/src/core/ext/transport/binder/wire_format/wire_writer.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
-#define GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
-
-#include <grpc/support/port_platform.h>
-
-#include <queue>
-#include <string>
-#include <vector>
-
-#include "absl/container/flat_hash_map.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/transaction.h"
-#include "src/core/lib/iomgr/combiner.h"
-#include "src/core/util/sync.h"
-
-namespace grpc_binder {
-
-// Member functions are thread safe.
-class WireWriter {
- public:
-  virtual ~WireWriter() = default;
-  virtual absl::Status RpcCall(std::unique_ptr<Transaction> tx) = 0;
-  virtual absl::Status SendAck(int64_t num_bytes) = 0;
-  virtual void OnAckReceived(int64_t num_bytes) = 0;
-};
-
-class WireWriterImpl : public WireWriter {
- public:
-  explicit WireWriterImpl(std::unique_ptr<Binder> binder);
-  ~WireWriterImpl() override;
-  absl::Status RpcCall(std::unique_ptr<Transaction> tx) override;
-  absl::Status SendAck(int64_t num_bytes) override;
-  void OnAckReceived(int64_t num_bytes) override;
-
-  // Required to be public because we would like to call this in combiner (which
-  // cannot invoke class member function). `RunScheduledTxArgs` and
-  // `RunScheduledTxInternal` should not be used by user directly.
-  struct RunScheduledTxArgs {
-    WireWriterImpl* writer;
-    struct StreamTx {
-      std::unique_ptr<Transaction> tx;
-      // How many data in transaction's `data` field has been sent.
-      int64_t bytes_sent = 0;
-    };
-    struct AckTx {
-      int64_t num_bytes;
-    };
-    absl::variant<AckTx, StreamTx> tx;
-  };
-
-  void RunScheduledTxInternal(RunScheduledTxArgs* arg);
-
-  // Split long message into chunks of size 16k. This doesn't necessarily have
-  // to be the same as the flow control acknowledgement size, but it should not
-  // exceed 128k.
-  static const int64_t kBlockSize;
-
-  // Flow control allows sending at most 128k between acknowledgements.
-  static const int64_t kFlowControlWindowSize;
-
- private:
-  // Fast path: send data in one transaction.
-  absl::Status RpcCallFastPath(std::unique_ptr<Transaction> tx);
-
-  // This function will acquire `write_mu_` to make sure the binder is not used
-  // concurrently, so this can be called by different threads safely.
-  absl::Status MakeBinderTransaction(
-      BinderTransportTxCode tx_code,
-      std::function<absl::Status(WritableParcel*)> fill_parcel);
-
-  // Send a stream to `binder_`. Set `is_last_chunk` to `true` if the stream
-  // transaction has been sent completely. Otherwise set to `false`.
-  absl::Status RunStreamTx(RunScheduledTxArgs::StreamTx* stream_tx,
-                           WritableParcel* parcel, bool* is_last_chunk)
-      ABSL_EXCLUSIVE_LOCKS_REQUIRED(write_mu_);
-
-  // Schdule `RunScheduledTxArgs*` in `pending_outgoing_tx_` to `combiner_`, as
-  // many as possible (under the constraint of `kFlowControlWindowSize`).
-  void TryScheduleTransaction();
-
-  // Guards variables related to transport state.
-  grpc_core::Mutex write_mu_;
-  std::unique_ptr<Binder> binder_ ABSL_GUARDED_BY(write_mu_);
-
-  // Maps the transaction code (which identifies streams) to their next
-  // available sequence number. See
-  // https://github.com/grpc/proposal/blob/master/L73-java-binderchannel/wireformat.md#sequence-number
-  absl::flat_hash_map<int, int> next_seq_num_ ABSL_GUARDED_BY(write_mu_);
-
-  // Number of bytes we have already sent in stream transactions.
-  std::atomic<int64_t> num_outgoing_bytes_{0};
-
-  // Guards variables related to flow control logic.
-  grpc_core::Mutex flow_control_mu_;
-  int64_t num_acknowledged_bytes_ ABSL_GUARDED_BY(flow_control_mu_) = 0;
-
-  // The queue takes ownership of the pointer.
-  std::queue<RunScheduledTxArgs*> pending_outgoing_tx_
-      ABSL_GUARDED_BY(flow_control_mu_);
-  int num_non_acked_tx_in_combiner_ ABSL_GUARDED_BY(flow_control_mu_) = 0;
-
-  // Helper variable for determining if we are currently calling into
-  // `Binder::Transact`. Useful for avoiding the attempt of acquiring
-  // `write_mu_` multiple times on the same thread.
-  std::atomic_bool is_transacting_{false};
-
-  grpc_core::Combiner* combiner_;
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_BINDER_WIRE_FORMAT_WIRE_WRITER_H
diff --git a/src/core/plugin_registry/grpc_plugin_registry.cc b/src/core/plugin_registry/grpc_plugin_registry.cc
index 0db484ac828..4022d1f5735 100644
--- a/src/core/plugin_registry/grpc_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_plugin_registry.cc
@@ -72,9 +72,6 @@ extern void RegisterLoadBalancedCallDestination(
 #ifndef GRPC_NO_RLS
 extern void RegisterRlsLbPolicy(CoreConfiguration::Builder* builder);
 #endif  // !GRPC_NO_RLS
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-extern void RegisterBinderResolver(CoreConfiguration::Builder* builder);
-#endif
 
 namespace {
 
@@ -122,9 +119,6 @@ void BuildCoreConfiguration(CoreConfiguration::Builder* builder) {
   RegisterFakeResolver(builder);
   RegisterHttpProxyMapper(builder);
   RegisterLoadBalancedCallDestination(builder);
-#ifdef GPR_SUPPORT_BINDER_TRANSPORT
-  RegisterBinderResolver(builder);
-#endif
 #ifndef GRPC_NO_RLS
   RegisterRlsLbPolicy(builder);
 #endif  // !GRPC_NO_RLS
diff --git a/src/core/resolver/binder/README.md b/src/core/resolver/binder/README.md
deleted file mode 100644
index b60296765d5..00000000000
--- a/src/core/resolver/binder/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Support for resolving the scheme used by binder transport implementation.
-
-The URI's authority is required to be empty.
-
-The path is used as the identifiers of endpoint binder objects and the length
-limit of the identifier is the same as unix socket length limit.
-
-The length limit of the path should at least be 100 characters long. This is
-guaranteed by `static_assert` in the implementation.
diff --git a/src/core/resolver/binder/binder_resolver.cc b/src/core/resolver/binder/binder_resolver.cc
deleted file mode 100644
index 326cee10754..00000000000
--- a/src/core/resolver/binder/binder_resolver.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/support/port_platform.h>
-
-#include <algorithm>
-
-#include "absl/status/status.h"
-#include "src/core/lib/iomgr/port.h"  // IWYU pragma: keep
-#include "src/core/util/status_helper.h"
-
-#ifdef GRPC_HAVE_UNIX_SOCKET
-
-#include <string.h>
-#ifdef GPR_WINDOWS
-// clang-format off
-#include <ws2def.h>
-#include <afunix.h>
-// clang-format on
-#else
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif  // GPR_WINDOWS
-
-#include <memory>
-#include <utility>
-
-#include "absl/log/log.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
-#include "absl/strings/strip.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/resolver/endpoint_addresses.h"
-#include "src/core/resolver/resolver.h"
-#include "src/core/resolver/resolver_factory.h"
-#include "src/core/util/orphanable.h"
-#include "src/core/util/uri.h"
-
-namespace grpc_core {
-namespace {
-
-class BinderResolver final : public Resolver {
- public:
-  BinderResolver(EndpointAddressesList addresses, ResolverArgs args)
-      : result_handler_(std::move(args.result_handler)),
-        addresses_(std::move(addresses)),
-        channel_args_(std::move(args.args)) {}
-
-  void StartLocked() override {
-    Result result;
-    result.addresses = std::move(addresses_);
-    result.args = channel_args_;
-    channel_args_ = ChannelArgs();
-    result_handler_->ReportResult(std::move(result));
-  }
-
-  void ShutdownLocked() override {}
-
- private:
-  std::unique_ptr<ResultHandler> result_handler_;
-  EndpointAddressesList addresses_;
-  ChannelArgs channel_args_;
-};
-
-class BinderResolverFactory final : public ResolverFactory {
- public:
-  absl::string_view scheme() const override { return "binder"; }
-
-  bool IsValidUri(const URI& uri) const override {
-    return ParseUri(uri, nullptr);
-  }
-
-  OrphanablePtr<Resolver> CreateResolver(ResolverArgs args) const override {
-    EndpointAddressesList addresses;
-    if (!ParseUri(args.uri, &addresses)) return nullptr;
-    return MakeOrphanable<BinderResolver>(std::move(addresses),
-                                          std::move(args));
-  }
-
- private:
-  static grpc_error_handle BinderAddrPopulate(
-      absl::string_view path, grpc_resolved_address* resolved_addr) {
-    path = absl::StripPrefix(path, "/");
-    if (path.empty()) {
-      return GRPC_ERROR_CREATE("path is empty");
-    }
-    // Store parsed path in a unix socket so it can be reinterpreted as
-    // sockaddr. An invalid address family (AF_MAX) is set to make sure it won't
-    // be accidentally used.
-    memset(resolved_addr, 0, sizeof(*resolved_addr));
-    struct sockaddr_un* un =
-        reinterpret_cast<struct sockaddr_un*>(resolved_addr->addr);
-    un->sun_family = AF_MAX;
-    static_assert(sizeof(un->sun_path) >= 101,
-                  "unix socket path size is unexpectedly short");
-    if (path.size() + 1 > sizeof(un->sun_path)) {
-      return GRPC_ERROR_CREATE(
-          absl::StrCat(path, " is too long to be handled"));
-    }
-    // `un` has already be set to zero, no need to append null after the string
-    memcpy(un->sun_path, path.data(), path.size());
-    resolved_addr->len =
-        static_cast<socklen_t>(sizeof(un->sun_family) + path.size() + 1);
-    return absl::OkStatus();
-  }
-
-  static bool ParseUri(const URI& uri, EndpointAddressesList* addresses) {
-    grpc_resolved_address addr;
-    {
-      if (!uri.authority().empty()) {
-        LOG(ERROR) << "authority is not supported in binder scheme";
-        return false;
-      }
-      grpc_error_handle error = BinderAddrPopulate(uri.path(), &addr);
-      if (!error.ok()) {
-        LOG(ERROR) << StatusToString(error);
-        return false;
-      }
-    }
-    if (addresses != nullptr) {
-      addresses->emplace_back(addr, ChannelArgs());
-    }
-    return true;
-  }
-};
-
-}  // namespace
-
-void RegisterBinderResolver(CoreConfiguration::Builder* builder) {
-  builder->resolver_registry()->RegisterResolverFactory(
-      std::make_unique<BinderResolverFactory>());
-}
-
-}  // namespace grpc_core
-
-#endif
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 35b512712eb..8e5687f3941 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -707,7 +707,6 @@ CORE_SOURCE_FILES = [
     'src/core/load_balancing/xds/xds_wrr_locality.cc',
     'src/core/plugin_registry/grpc_plugin_registry.cc',
     'src/core/plugin_registry/grpc_plugin_registry_extra.cc',
-    'src/core/resolver/binder/binder_resolver.cc',
     'src/core/resolver/dns/c_ares/dns_resolver_ares.cc',
     'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc',
     'src/core/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc',
diff --git a/test/core/resolver/BUILD b/test/core/resolver/BUILD
index effbbac9dad..bf3e38a6f12 100644
--- a/test/core/resolver/BUILD
+++ b/test/core/resolver/BUILD
@@ -36,22 +36,6 @@ grpc_cc_test(
     ],
 )
 
-grpc_cc_test(
-    name = "binder_resolver_test",
-    srcs = ["binder_resolver_test.cc"],
-    external_deps = [
-        "absl/log:log",
-        "gtest",
-    ],
-    language = "C++",
-    deps = [
-        "//:gpr",
-        "//:grpc",
-        "//src/core:grpc_resolver_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
 grpc_cc_test(
     name = "dns_resolver_test",
     srcs = ["dns_resolver_test.cc"],
diff --git a/test/core/resolver/binder_resolver_test.cc b/test/core/resolver/binder_resolver_test.cc
deleted file mode 100644
index fa8430fb11f..00000000000
--- a/test/core/resolver/binder_resolver_test.cc
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "gtest/gtest.h"
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/iomgr/port.h"
-#include "src/core/lib/iomgr/resolved_address.h"
-#include "src/core/resolver/endpoint_addresses.h"
-#include "src/core/resolver/resolver.h"
-#include "src/core/resolver/resolver_factory.h"
-#include "src/core/util/orphanable.h"
-#include "src/core/util/uri.h"
-#include "test/core/test_util/test_config.h"
-
-#ifdef GRPC_HAVE_UNIX_SOCKET
-
-#ifdef GPR_WINDOWS
-// clang-format off
-#include <ws2def.h>
-#include <afunix.h>
-// clang-format on
-#else
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif  // GPR_WINDOWS
-
-#include <grpc/grpc.h>
-
-#include "absl/log/log.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
-#include "src/core/resolver/resolver_registry.h"
-
-// Registers the factory with `grpc_core::ResolverRegistry`. Defined in
-// binder_resolver.cc
-namespace grpc_core {
-void RegisterBinderResolver(CoreConfiguration::Builder* builder);
-}
-
-namespace {
-
-class BinderResolverTest : public ::testing::Test {
- public:
-  BinderResolverTest() {
-    factory_ = grpc_core::CoreConfiguration::Get()
-                   .resolver_registry()
-                   .LookupResolverFactory("binder");
-  }
-  ~BinderResolverTest() override {}
-  static void SetUpTestSuite() {
-    builder_ =
-        std::make_unique<grpc_core::CoreConfiguration::WithSubstituteBuilder>(
-            [](grpc_core::CoreConfiguration::Builder* builder) {
-              BuildCoreConfiguration(builder);
-              if (!builder->resolver_registry()->HasResolverFactory("binder")) {
-                // Binder resolver will only be registered on platforms that
-                // support binder transport. If it is not registered on current
-                // platform, we manually register it here for testing purpose.
-                RegisterBinderResolver(builder);
-                ASSERT_TRUE(
-                    builder->resolver_registry()->HasResolverFactory("binder"));
-              }
-            });
-    grpc_init();
-    if (grpc_core::CoreConfiguration::Get()
-            .resolver_registry()
-            .LookupResolverFactory("binder") == nullptr) {
-    }
-  }
-  static void TearDownTestSuite() {
-    grpc_shutdown();
-    builder_.reset();
-  }
-
-  void SetUp() override { ASSERT_TRUE(factory_); }
-
-  class ResultHandler : public grpc_core::Resolver::ResultHandler {
-   public:
-    ResultHandler() = default;
-
-    explicit ResultHandler(const std::string& expected_binder_id)
-        : expect_result_(true), expected_binder_id_(expected_binder_id) {}
-
-    void ReportResult(grpc_core::Resolver::Result result) override {
-      EXPECT_TRUE(expect_result_);
-      ASSERT_TRUE(result.addresses.ok());
-      ASSERT_EQ(result.addresses->size(), 1);
-      grpc_core::EndpointAddresses addr = (*result.addresses)[0];
-      const struct sockaddr_un* un =
-          reinterpret_cast<const struct sockaddr_un*>(addr.address().addr);
-      EXPECT_EQ(addr.address().len,
-                sizeof(un->sun_family) + expected_binder_id_.length() + 1);
-      EXPECT_EQ(un->sun_family, AF_MAX);
-      EXPECT_EQ(un->sun_path, expected_binder_id_);
-    }
-
-   private:
-    // Whether we expect ReportResult function to be invoked
-    bool expect_result_ = false;
-
-    std::string expected_binder_id_;
-  };
-
-  void TestSucceeds(const char* string, const std::string& expected_path) {
-    VLOG(2) << "test: '" << string << "' should be valid for '"
-            << factory_->scheme();
-    grpc_core::ExecCtx exec_ctx;
-    absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(string);
-    ASSERT_TRUE(uri.ok()) << uri.status().ToString();
-    grpc_core::ResolverArgs args;
-    args.uri = std::move(*uri);
-    args.result_handler =
-        std::make_unique<BinderResolverTest::ResultHandler>(expected_path);
-    grpc_core::OrphanablePtr<grpc_core::Resolver> resolver =
-        factory_->CreateResolver(std::move(args));
-    ASSERT_TRUE(resolver != nullptr);
-    resolver->StartLocked();
-  }
-
-  void TestFails(const char* string) {
-    VLOG(2) << "test: '" << string << "' should be invalid for '"
-            << factory_->scheme();
-    grpc_core::ExecCtx exec_ctx;
-    absl::StatusOr<grpc_core::URI> uri = grpc_core::URI::Parse(string);
-    ASSERT_TRUE(uri.ok()) << uri.status().ToString();
-    grpc_core::ResolverArgs args;
-    args.uri = std::move(*uri);
-    args.result_handler = std::make_unique<BinderResolverTest::ResultHandler>();
-    grpc_core::OrphanablePtr<grpc_core::Resolver> resolver =
-        factory_->CreateResolver(std::move(args));
-    EXPECT_TRUE(resolver == nullptr);
-  }
-
- private:
-  grpc_core::ResolverFactory* factory_;
-  static std::unique_ptr<grpc_core::CoreConfiguration::WithSubstituteBuilder>
-      builder_;
-};
-
-std::unique_ptr<grpc_core::CoreConfiguration::WithSubstituteBuilder>
-    BinderResolverTest::builder_;
-
-}  // namespace
-
-// Authority is not allowed
-TEST_F(BinderResolverTest, AuthorityPresents) {
-  TestFails("binder://example");
-  TestFails("binder://google.com");
-  TestFails("binder://google.com/test");
-}
-
-// Path cannot be empty
-TEST_F(BinderResolverTest, EmptyPath) {
-  TestFails("binder:");
-  TestFails("binder:/");
-  TestFails("binder://");
-}
-
-TEST_F(BinderResolverTest, PathLength) {
-  // Note that we have a static assert in binder_resolver.cc that checks
-  // sizeof(sockaddr_un::sun_path) is greater than 100
-
-  // 100 character path should be fine
-  TestSucceeds(("binder:l" + std::string(98, 'o') + "g").c_str(),
-               "l" + std::string(98, 'o') + "g");
-
-  // 200 character path most likely will fail
-  TestFails(("binder:l" + std::string(198, 'o') + "g").c_str());
-}
-
-TEST_F(BinderResolverTest, SlashPrefixes) {
-  TestSucceeds("binder:///test", "test");
-  TestSucceeds("binder:////test", "/test");
-}
-
-TEST_F(BinderResolverTest, ValidCases) {
-  TestSucceeds("binder:[[", "[[");
-  TestSucceeds("binder:google!com", "google!com");
-  TestSucceeds("binder:test/", "test/");
-  TestSucceeds("binder:test:", "test:");
-
-  TestSucceeds("binder:e", "e");
-  TestSucceeds("binder:example", "example");
-  TestSucceeds("binder:google.com", "google.com");
-  TestSucceeds("binder:~", "~");
-  TestSucceeds("binder:12345", "12345");
-  TestSucceeds(
-      "binder:abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._"
-      "~",
-      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~");
-}
-
-#endif  // GRPC_HAVE_UNIX_SOCKET
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/binder/BUILD b/test/core/transport/binder/BUILD
deleted file mode 100644
index 1f7d3ebb9a0..00000000000
--- a/test/core/transport/binder/BUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
-
-licenses(["notice"])
-
-grpc_package(
-    name = "test/core/transport/binder",
-    visibility = "tests",
-)
-
-grpc_cc_library(
-    name = "mock_objects",
-    testonly = 1,
-    srcs = ["mock_objects.cc"],
-    hdrs = ["mock_objects.h"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    deps = [
-        "//:grpc++_binder",
-    ],
-)
-
-grpc_cc_test(
-    name = "wire_writer_test",
-    srcs = ["wire_writer_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "wire_reader_test",
-    srcs = ["wire_reader_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "transport_stream_receiver_test",
-    srcs = ["transport_stream_receiver_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "binder_transport_test",
-    srcs = ["binder_transport_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "absl/strings",
-        "gtest",
-    ],
-    language = "C++",
-    tags = [
-        # To avoid `symbolizer buffer too small` warning of UBSAN
-        "noubsan",
-        "no_test_ios",
-    ],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "endpoint_binder_pool_test",
-    srcs = ["endpoint_binder_pool_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":mock_objects",
-        "//:grpc",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
diff --git a/test/core/transport/binder/binder_transport_test.cc b/test/core/transport/binder/binder_transport_test.cc
deleted file mode 100644
index 959a6fd33a0..00000000000
--- a/test/core/transport/binder/binder_transport_test.cc
+++ /dev/null
@@ -1,729 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Unit-tests for grpc_binder_transport
-//
-// Verify that a calls to the perform_stream_op of grpc_binder_transport
-// transform into the correct sequence of binder transactions.
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <gtest/gtest.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include "absl/memory/memory.h"
-#include "absl/strings/match.h"
-#include "absl/strings/str_join.h"
-#include "src/core/ext/transport/binder/transport/binder_stream.h"
-#include "src/core/lib/resource_quota/resource_quota.h"
-#include "src/core/util/notification.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/mock_objects.h"
-
-namespace grpc_binder {
-namespace {
-
-using ::testing::Expectation;
-using ::testing::NiceMock;
-using ::testing::Return;
-
-class BinderTransportTest : public ::testing::Test {
- public:
-  BinderTransportTest()
-      : transport_(grpc_create_binder_transport_client(
-            std::make_unique<NiceMock<MockBinder>>(),
-            std::make_shared<
-                grpc::experimental::binder::UntrustedSecurityPolicy>())) {
-    auto* gbt = reinterpret_cast<grpc_binder_transport*>(transport_);
-    gbt->wire_writer = std::make_unique<MockWireWriter>();
-    GRPC_STREAM_REF_INIT(&ref_, 1, nullptr, nullptr, "phony ref");
-  }
-
-  ~BinderTransportTest() override {
-    grpc_core::ExecCtx exec_ctx;
-    transport_->Orphan();
-    grpc_core::ExecCtx::Get()->Flush();
-    for (grpc_binder_stream* gbs : stream_buffer_) {
-      gbs->~grpc_binder_stream();
-      gpr_free(gbs);
-    }
-  }
-
-  void PerformStreamOp(grpc_binder_stream* gbs,
-                       grpc_transport_stream_op_batch* op) {
-    transport_->filter_stack_transport()->PerformStreamOp(
-        reinterpret_cast<grpc_stream*>(gbs), op);
-  }
-
-  grpc_binder_transport* GetBinderTransport() {
-    return reinterpret_cast<grpc_binder_transport*>(transport_);
-  }
-
-  grpc_binder_stream* InitNewBinderStream() {
-    grpc_binder_stream* gbs = static_cast<grpc_binder_stream*>(
-        gpr_malloc(transport_->filter_stack_transport()->SizeOfStream()));
-    transport_->filter_stack_transport()->InitStream(
-        reinterpret_cast<grpc_stream*>(gbs), &ref_, nullptr, arena_.get());
-    stream_buffer_.push_back(gbs);
-    return gbs;
-  }
-
-  MockWireWriter& GetWireWriter() {
-    return *reinterpret_cast<MockWireWriter*>(
-        GetBinderTransport()->wire_writer.get());
-  }
-
-  static void SetUpTestSuite() { grpc_init(); }
-  static void TearDownTestSuite() { grpc_shutdown(); }
-
- protected:
-  grpc_core::RefCountedPtr<grpc_core::Arena> arena_ =
-      grpc_core::SimpleArenaAllocator()->MakeArena();
-  grpc_core::Transport* transport_;
-  grpc_stream_refcount ref_;
-  std::vector<grpc_binder_stream*> stream_buffer_;
-};
-
-void MockCallback(void* arg, grpc_error_handle error);
-
-class MockGrpcClosure {
- public:
-  explicit MockGrpcClosure(grpc_core::Notification* notification = nullptr)
-      : notification_(notification) {
-    GRPC_CLOSURE_INIT(&closure_, MockCallback, this, nullptr);
-  }
-
-  grpc_closure* GetGrpcClosure() { return &closure_; }
-  MOCK_METHOD(void, Callback, (grpc_error_handle), ());
-
-  grpc_core::Notification* notification_;
-
- private:
-  grpc_closure closure_;
-};
-
-void MockCallback(void* arg, grpc_error_handle error) {
-  MockGrpcClosure* mock_closure = static_cast<MockGrpcClosure*>(arg);
-  mock_closure->Callback(error);
-  if (mock_closure->notification_) {
-    mock_closure->notification_->Notify();
-  }
-}
-
-std::string MetadataString(const Metadata& a) {
-  return absl::StrCat(
-      "{",
-      absl::StrJoin(
-          a, ", ",
-          [](std::string* out, const std::pair<std::string, std::string>& kv) {
-            out->append(
-                absl::StrCat("\"", kv.first, "\": \"", kv.second, "\""));
-          }),
-      "}");
-}
-
-bool MetadataEquivalent(Metadata a, Metadata b) {
-  std::sort(a.begin(), a.end());
-  std::sort(b.begin(), b.end());
-  return a == b;
-}
-
-// Matches with transactions having the desired flag, method_ref,
-// initial_metadata, and message_data.
-MATCHER_P4(TransactionMatches, flag, method_ref, initial_metadata, message_data,
-           "") {
-  if (arg->GetFlags() != flag) return false;
-  if (flag & kFlagPrefix) {
-    if (arg->GetMethodRef() != method_ref) {
-      printf("METHOD REF NOT EQ: %s %s\n",
-             std::string(arg->GetMethodRef()).c_str(),
-             std::string(method_ref).c_str());
-      return false;
-    }
-    if (!MetadataEquivalent(arg->GetPrefixMetadata(), initial_metadata)) {
-      printf("METADATA NOT EQUIVALENT: %s %s\n",
-             MetadataString(arg->GetPrefixMetadata()).c_str(),
-             MetadataString(initial_metadata).c_str());
-      return false;
-    }
-  }
-  if (flag & kFlagMessageData) {
-    if (arg->GetMessageData() != message_data) return false;
-  }
-  return true;
-}
-
-// Matches with grpc_error having error message containing |msg|.
-MATCHER_P(GrpcErrorMessageContains, msg, "") {
-  return absl::StrContains(grpc_core::StatusToString(arg), msg);
-}
-
-namespace {
-class MetadataEncoder {
- public:
-  void Encode(const grpc_core::Slice& key, const grpc_core::Slice& value) {
-    metadata_.emplace_back(std::string(key.as_string_view()),
-                           std::string(value.as_string_view()));
-  }
-
-  template <typename Which>
-  void Encode(Which, const typename Which::ValueType& value) {
-    metadata_.emplace_back(
-        std::string(Which::key()),
-        // NOLINTNEXTLINE(google-readability-casting)
-        std::string(grpc_core::Slice(Which::Encode(value)).as_string_view()));
-  }
-
-  const Metadata& metadata() const { return metadata_; }
-
- private:
-  Metadata metadata_;
-};
-}  // namespace
-
-// Verify that the lower-level metadata has the same content as the gRPC
-// metadata.
-void VerifyMetadataEqual(const Metadata& md,
-                         const grpc_metadata_batch& grpc_md) {
-  MetadataEncoder encoder;
-  grpc_md.Encode(&encoder);
-  EXPECT_TRUE(MetadataEquivalent(encoder.metadata(), md));
-}
-
-// RAII helper classes for constructing gRPC metadata and receiving callbacks.
-struct MakeSendInitialMetadata {
-  MakeSendInitialMetadata(const Metadata& initial_metadata,
-                          const std::string& method_ref,
-                          grpc_transport_stream_op_batch* op) {
-    for (const auto& md : initial_metadata) {
-      const std::string& key = md.first;
-      const std::string& value = md.second;
-      grpc_initial_metadata.Append(
-          key, grpc_core::Slice::FromCopiedString(value),
-          [](absl::string_view, const grpc_core::Slice&) { abort(); });
-    }
-    if (!method_ref.empty()) {
-      grpc_initial_metadata.Set(grpc_core::HttpPathMetadata(),
-                                grpc_core::Slice::FromCopiedString(method_ref));
-    }
-    op->send_initial_metadata = true;
-    op->payload->send_initial_metadata.send_initial_metadata =
-        &grpc_initial_metadata;
-  }
-  ~MakeSendInitialMetadata() {}
-
-  grpc_metadata_batch grpc_initial_metadata;
-};
-
-struct MakeSendMessage {
-  MakeSendMessage(const std::string& message,
-                  grpc_transport_stream_op_batch* op) {
-    send_stream.Append(grpc_core::Slice::FromCopiedString(message));
-
-    op->send_message = true;
-    op->payload->send_message.send_message = &send_stream;
-  }
-
-  grpc_core::SliceBuffer send_stream;
-};
-
-struct MakeSendTrailingMetadata {
-  explicit MakeSendTrailingMetadata(const Metadata& trailing_metadata,
-                                    grpc_transport_stream_op_batch* op) {
-    EXPECT_TRUE(trailing_metadata.empty());
-
-    op->send_trailing_metadata = true;
-    op->payload->send_trailing_metadata.send_trailing_metadata =
-        &grpc_trailing_metadata;
-  }
-
-  grpc_core::MemoryAllocator memory_allocator =
-      grpc_core::MemoryAllocator(grpc_core::ResourceQuota::Default()
-                                     ->memory_quota()
-                                     ->CreateMemoryAllocator("test"));
-  grpc_metadata_batch grpc_trailing_metadata;
-};
-
-struct MakeRecvInitialMetadata {
-  explicit MakeRecvInitialMetadata(grpc_transport_stream_op_batch* op,
-                                   Expectation* call_before = nullptr)
-      : ready(&notification) {
-    op->recv_initial_metadata = true;
-    op->payload->recv_initial_metadata.recv_initial_metadata =
-        &grpc_initial_metadata;
-    op->payload->recv_initial_metadata.recv_initial_metadata_ready =
-        ready.GetGrpcClosure();
-    if (call_before) {
-      EXPECT_CALL(ready, Callback).After(*call_before);
-    } else {
-      EXPECT_CALL(ready, Callback);
-    }
-  }
-
-  ~MakeRecvInitialMetadata() {}
-
-  MockGrpcClosure ready;
-  grpc_core::MemoryAllocator memory_allocator =
-      grpc_core::MemoryAllocator(grpc_core::ResourceQuota::Default()
-                                     ->memory_quota()
-                                     ->CreateMemoryAllocator("test"));
-  grpc_metadata_batch grpc_initial_metadata;
-  grpc_core::Notification notification;
-};
-
-struct MakeRecvMessage {
-  explicit MakeRecvMessage(grpc_transport_stream_op_batch* op,
-                           Expectation* call_before = nullptr)
-      : ready(&notification) {
-    op->recv_message = true;
-    op->payload->recv_message.recv_message = &grpc_message;
-    op->payload->recv_message.recv_message_ready = ready.GetGrpcClosure();
-    if (call_before) {
-      EXPECT_CALL(ready, Callback).After(*call_before);
-    } else {
-      EXPECT_CALL(ready, Callback);
-    }
-  }
-
-  MockGrpcClosure ready;
-  grpc_core::Notification notification;
-  absl::optional<grpc_core::SliceBuffer> grpc_message;
-};
-
-struct MakeRecvTrailingMetadata {
-  explicit MakeRecvTrailingMetadata(grpc_transport_stream_op_batch* op,
-                                    Expectation* call_before = nullptr)
-      : ready(&notification) {
-    op->recv_trailing_metadata = true;
-    op->payload->recv_trailing_metadata.recv_trailing_metadata =
-        &grpc_trailing_metadata;
-    op->payload->recv_trailing_metadata.recv_trailing_metadata_ready =
-        ready.GetGrpcClosure();
-    if (call_before) {
-      EXPECT_CALL(ready, Callback).After(*call_before);
-    } else {
-      EXPECT_CALL(ready, Callback);
-    }
-  }
-
-  ~MakeRecvTrailingMetadata() {}
-
-  MockGrpcClosure ready;
-  grpc_core::MemoryAllocator memory_allocator =
-      grpc_core::MemoryAllocator(grpc_core::ResourceQuota::Default()
-                                     ->memory_quota()
-                                     ->CreateMemoryAllocator("test"));
-  grpc_metadata_batch grpc_trailing_metadata;
-  grpc_core::Notification notification;
-};
-
-const Metadata kDefaultMetadata = {
-    {"", ""},
-    {"", "value"},
-    {"key", ""},
-    {"key", "value"},
-};
-
-constexpr char kDefaultMethodRef[] = "/some/path";
-constexpr char kDefaultMessage[] = "binder transport message";
-constexpr int kDefaultStatus = 0x1234;
-
-Metadata AppendMethodRef(const Metadata& md, const std::string& method_ref) {
-  Metadata result = md;
-  result.emplace_back(":path", method_ref);
-  return result;
-}
-
-Metadata AppendStatus(const Metadata& md, int status) {
-  Metadata result = md;
-  result.emplace_back("grpc-status", std::to_string(status));
-  return result;
-}
-
-}  // namespace
-
-TEST_F(BinderTransportTest, CreateBinderTransport) {
-  EXPECT_NE(transport_, nullptr);
-}
-
-TEST_F(BinderTransportTest, TransactionIdIncrement) {
-  grpc_binder_stream* gbs0 = InitNewBinderStream();
-  EXPECT_EQ(gbs0->t, GetBinderTransport());
-  EXPECT_EQ(gbs0->tx_code, kFirstCallId);
-  grpc_binder_stream* gbs1 = InitNewBinderStream();
-  EXPECT_EQ(gbs1->t, GetBinderTransport());
-  EXPECT_EQ(gbs1->tx_code, kFirstCallId + 1);
-  grpc_binder_stream* gbs2 = InitNewBinderStream();
-  EXPECT_EQ(gbs2->t, GetBinderTransport());
-  EXPECT_EQ(gbs2->tx_code, kFirstCallId + 2);
-}
-
-TEST_F(BinderTransportTest, PerformSendInitialMetadata) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-  const Metadata kInitialMetadata = kDefaultMetadata;
-  MakeSendInitialMetadata send_initial_metadata(kInitialMetadata, "", &op);
-  MockGrpcClosure mock_on_complete;
-  op.on_complete = mock_on_complete.GetGrpcClosure();
-
-  ::testing::InSequence sequence;
-  EXPECT_CALL(GetWireWriter(), RpcCall(TransactionMatches(
-                                   kFlagPrefix, "", kInitialMetadata, "")));
-  EXPECT_CALL(mock_on_complete, Callback);
-
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-}
-
-TEST_F(BinderTransportTest, PerformSendInitialMetadataMethodRef) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-  const Metadata kInitialMetadata = kDefaultMetadata;
-  const std::string kMethodRef = kDefaultMethodRef;
-  MakeSendInitialMetadata send_initial_metadata(kInitialMetadata, kMethodRef,
-                                                &op);
-  MockGrpcClosure mock_on_complete;
-  op.on_complete = mock_on_complete.GetGrpcClosure();
-
-  ::testing::InSequence sequence;
-  EXPECT_CALL(GetWireWriter(),
-              RpcCall(TransactionMatches(kFlagPrefix, kMethodRef.substr(1),
-                                         kInitialMetadata, "")));
-  EXPECT_CALL(mock_on_complete, Callback);
-
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-}
-
-TEST_F(BinderTransportTest, PerformSendMessage) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  const std::string kMessage = kDefaultMessage;
-  MakeSendMessage send_message(kMessage, &op);
-  MockGrpcClosure mock_on_complete;
-  op.on_complete = mock_on_complete.GetGrpcClosure();
-
-  ::testing::InSequence sequence;
-  EXPECT_CALL(
-      GetWireWriter(),
-      RpcCall(TransactionMatches(kFlagMessageData, "", Metadata{}, kMessage)));
-  EXPECT_CALL(mock_on_complete, Callback);
-
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-}
-
-TEST_F(BinderTransportTest, PerformSendTrailingMetadata) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-  // The wireformat guarantees that suffix metadata will always be empty.
-  // TODO(waynetu): Check whether gRPC can internally add extra trailing
-  // metadata.
-  const Metadata kTrailingMetadata = {};
-  MakeSendTrailingMetadata send_trailing_metadata(kTrailingMetadata, &op);
-  MockGrpcClosure mock_on_complete;
-  op.on_complete = mock_on_complete.GetGrpcClosure();
-
-  ::testing::InSequence sequence;
-  EXPECT_CALL(GetWireWriter(), RpcCall(TransactionMatches(
-                                   kFlagSuffix, "", kTrailingMetadata, "")));
-  EXPECT_CALL(mock_on_complete, Callback);
-
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-}
-
-TEST_F(BinderTransportTest, PerformSendAll) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  const Metadata kInitialMetadata = kDefaultMetadata;
-  const std::string kMethodRef = kDefaultMethodRef;
-  MakeSendInitialMetadata send_initial_metadata(kInitialMetadata, kMethodRef,
-                                                &op);
-
-  const std::string kMessage = kDefaultMessage;
-  MakeSendMessage send_message(kMessage, &op);
-
-  // The wireformat guarantees that suffix metadata will always be empty.
-  // TODO(waynetu): Check whether gRPC can internally add extra trailing
-  // metadata.
-  const Metadata kTrailingMetadata = {};
-  MakeSendTrailingMetadata send_trailing_metadata(kTrailingMetadata, &op);
-
-  MockGrpcClosure mock_on_complete;
-  op.on_complete = mock_on_complete.GetGrpcClosure();
-
-  ::testing::InSequence sequence;
-  EXPECT_CALL(GetWireWriter(),
-              RpcCall(TransactionMatches(
-                  kFlagPrefix | kFlagMessageData | kFlagSuffix,
-                  kMethodRef.substr(1), kInitialMetadata, kMessage)));
-  EXPECT_CALL(mock_on_complete, Callback);
-
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-}
-
-TEST_F(BinderTransportTest, PerformRecvInitialMetadata) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  MakeRecvInitialMetadata recv_initial_metadata(&op);
-
-  const Metadata kInitialMetadata = kDefaultMetadata;
-  auto* gbt = reinterpret_cast<grpc_binder_transport*>(transport_);
-  gbt->transport_stream_receiver->NotifyRecvInitialMetadata(gbs->tx_code,
-                                                            kInitialMetadata);
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-  recv_initial_metadata.notification.WaitForNotification();
-
-  VerifyMetadataEqual(kInitialMetadata,
-                      recv_initial_metadata.grpc_initial_metadata);
-}
-
-TEST_F(BinderTransportTest, PerformRecvInitialMetadataWithMethodRef) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  MakeRecvInitialMetadata recv_initial_metadata(&op);
-
-  auto* gbt = reinterpret_cast<grpc_binder_transport*>(transport_);
-  const Metadata kInitialMetadataWithMethodRef =
-      AppendMethodRef(kDefaultMetadata, kDefaultMethodRef);
-  gbt->transport_stream_receiver->NotifyRecvInitialMetadata(
-      gbs->tx_code, kInitialMetadataWithMethodRef);
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-  recv_initial_metadata.notification.WaitForNotification();
-
-  VerifyMetadataEqual(kInitialMetadataWithMethodRef,
-                      recv_initial_metadata.grpc_initial_metadata);
-}
-
-TEST_F(BinderTransportTest, PerformRecvMessage) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  MakeRecvMessage recv_message(&op);
-
-  auto* gbt = reinterpret_cast<grpc_binder_transport*>(transport_);
-  const std::string kMessage = kDefaultMessage;
-  gbt->transport_stream_receiver->NotifyRecvMessage(gbs->tx_code, kMessage);
-
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-  recv_message.notification.WaitForNotification();
-
-  EXPECT_EQ(kMessage, recv_message.grpc_message->JoinIntoString());
-}
-
-TEST_F(BinderTransportTest, PerformRecvTrailingMetadata) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  MakeRecvTrailingMetadata recv_trailing_metadata(&op);
-
-  const Metadata kTrailingMetadata = kDefaultMetadata;
-  auto* gbt = reinterpret_cast<grpc_binder_transport*>(transport_);
-  constexpr int kStatus = kDefaultStatus;
-  gbt->transport_stream_receiver->NotifyRecvTrailingMetadata(
-      gbs->tx_code, kTrailingMetadata, kStatus);
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-  recv_trailing_metadata.notification.WaitForNotification();
-
-  VerifyMetadataEqual(AppendStatus(kTrailingMetadata, kStatus),
-                      recv_trailing_metadata.grpc_trailing_metadata);
-}
-
-TEST_F(BinderTransportTest, PerformRecvAll) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  MakeRecvInitialMetadata recv_initial_metadata(&op);
-  MakeRecvMessage recv_message(&op);
-  MakeRecvTrailingMetadata recv_trailing_metadata(&op);
-
-  auto* gbt = reinterpret_cast<grpc_binder_transport*>(transport_);
-  const Metadata kInitialMetadataWithMethodRef =
-      AppendMethodRef(kDefaultMetadata, kDefaultMethodRef);
-  gbt->transport_stream_receiver->NotifyRecvInitialMetadata(
-      gbs->tx_code, kInitialMetadataWithMethodRef);
-
-  const std::string kMessage = kDefaultMessage;
-  gbt->transport_stream_receiver->NotifyRecvMessage(gbs->tx_code, kMessage);
-
-  Metadata trailing_metadata = kDefaultMetadata;
-  constexpr int kStatus = kDefaultStatus;
-  gbt->transport_stream_receiver->NotifyRecvTrailingMetadata(
-      gbs->tx_code, trailing_metadata, kStatus);
-  PerformStreamOp(gbs, &op);
-  grpc_core::ExecCtx::Get()->Flush();
-  recv_trailing_metadata.notification.WaitForNotification();
-
-  VerifyMetadataEqual(kInitialMetadataWithMethodRef,
-                      recv_initial_metadata.grpc_initial_metadata);
-  trailing_metadata.emplace_back("grpc-status", std::to_string(kStatus));
-  VerifyMetadataEqual(trailing_metadata,
-                      recv_trailing_metadata.grpc_trailing_metadata);
-  EXPECT_EQ(kMessage, recv_message.grpc_message->JoinIntoString());
-}
-
-TEST_F(BinderTransportTest, PerformAllOps) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-  grpc_transport_stream_op_batch op{};
-  grpc_transport_stream_op_batch_payload payload;
-  op.payload = &payload;
-
-  const Metadata kSendInitialMetadata = kDefaultMetadata;
-  const std::string kMethodRef = kDefaultMethodRef;
-  MakeSendInitialMetadata send_initial_metadata(kSendInitialMetadata,
-                                                kMethodRef, &op);
-
-  const std::string kSendMessage = kDefaultMessage;
-  MakeSendMessage send_message(kSendMessage, &op);
-
-  // The wireformat guarantees that suffix metadata will always be empty.
-  // TODO(waynetu): Check whether gRPC can internally add extra trailing
-  // metadata.
-  const Metadata kSendTrailingMetadata = {};
-  MakeSendTrailingMetadata send_trailing_metadata(kSendTrailingMetadata, &op);
-
-  MockGrpcClosure mock_on_complete;
-  op.on_complete = mock_on_complete.GetGrpcClosure();
-
-  // TODO(waynetu): Currently, we simply drop the prefix '/' from the :path
-  // argument to obtain the method name. Update the test if this turns out to be
-  // incorrect.
-  EXPECT_CALL(GetWireWriter(),
-              RpcCall(TransactionMatches(
-                  kFlagPrefix | kFlagMessageData | kFlagSuffix,
-                  kMethodRef.substr(1), kSendInitialMetadata, kSendMessage)));
-  Expectation on_complete = EXPECT_CALL(mock_on_complete, Callback);
-
-  // Recv callbacks can happen after the on_complete callback.
-  MakeRecvInitialMetadata recv_initial_metadata(
-      &op, /* call_before = */ &on_complete);
-  MakeRecvMessage recv_message(&op, /* call_before = */ &on_complete);
-  MakeRecvTrailingMetadata recv_trailing_metadata(
-      &op, /* call_before = */ &on_complete);
-
-  PerformStreamOp(gbs, &op);
-
-  // Flush the execution context to force on_complete to run before recv
-  // callbacks get scheduled.
-  grpc_core::ExecCtx::Get()->Flush();
-
-  auto* gbt = reinterpret_cast<grpc_binder_transport*>(transport_);
-  const Metadata kRecvInitialMetadata =
-      AppendMethodRef(kDefaultMetadata, kDefaultMethodRef);
-  gbt->transport_stream_receiver->NotifyRecvInitialMetadata(
-      gbs->tx_code, kRecvInitialMetadata);
-  const std::string kRecvMessage = kDefaultMessage;
-  gbt->transport_stream_receiver->NotifyRecvMessage(gbs->tx_code, kRecvMessage);
-  const Metadata kRecvTrailingMetadata = kDefaultMetadata;
-  constexpr int kStatus = 0x1234;
-  gbt->transport_stream_receiver->NotifyRecvTrailingMetadata(
-      gbs->tx_code, kRecvTrailingMetadata, kStatus);
-
-  grpc_core::ExecCtx::Get()->Flush();
-  recv_initial_metadata.notification.WaitForNotification();
-  recv_message.notification.WaitForNotification();
-  recv_trailing_metadata.notification.WaitForNotification();
-
-  VerifyMetadataEqual(kRecvInitialMetadata,
-                      recv_initial_metadata.grpc_initial_metadata);
-  VerifyMetadataEqual(AppendStatus(kRecvTrailingMetadata, kStatus),
-                      recv_trailing_metadata.grpc_trailing_metadata);
-
-  EXPECT_EQ(kRecvMessage, recv_message.grpc_message->JoinIntoString());
-}
-
-TEST_F(BinderTransportTest, WireWriterRpcCallErrorPropagates) {
-  grpc_core::ExecCtx exec_ctx;
-  grpc_binder_stream* gbs = InitNewBinderStream();
-
-  MockGrpcClosure mock_on_complete1;
-  MockGrpcClosure mock_on_complete2;
-
-  EXPECT_CALL(GetWireWriter(), RpcCall)
-      .WillOnce(Return(absl::OkStatus()))
-      .WillOnce(Return(absl::InternalError("WireWriter::RpcCall failed")));
-  EXPECT_CALL(mock_on_complete1, Callback(absl::OkStatus()));
-  EXPECT_CALL(mock_on_complete2,
-              Callback(GrpcErrorMessageContains("WireWriter::RpcCall failed")));
-
-  const Metadata kInitialMetadata = {};
-  grpc_transport_stream_op_batch op1{};
-  grpc_transport_stream_op_batch_payload payload1;
-  op1.payload = &payload1;
-  MakeSendInitialMetadata send_initial_metadata1(kInitialMetadata, "", &op1);
-  op1.on_complete = mock_on_complete1.GetGrpcClosure();
-
-  grpc_transport_stream_op_batch op2{};
-  grpc_transport_stream_op_batch_payload payload2;
-  op2.payload = &payload2;
-  MakeSendInitialMetadata send_initial_metadata2(kInitialMetadata, "", &op2);
-  op2.on_complete = mock_on_complete2.GetGrpcClosure();
-
-  PerformStreamOp(gbs, &op1);
-  PerformStreamOp(gbs, &op2);
-  grpc_core::ExecCtx::Get()->Flush();
-}
-
-}  // namespace grpc_binder
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/binder/end2end/BUILD b/test/core/transport/binder/end2end/BUILD
deleted file mode 100644
index 4e9ee2fe2d2..00000000000
--- a/test/core/transport/binder/end2end/BUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
-
-licenses(["notice"])
-
-grpc_package(
-    name = "test/core/transport/binder/end2end",
-    visibility = "tests",
-)
-
-grpc_cc_library(
-    name = "fake_binder",
-    testonly = 1,
-    srcs = ["fake_binder.cc"],
-    hdrs = ["fake_binder.h"],
-    external_deps = [
-        "absl/log:log",
-        "absl/memory",
-        "absl/random",
-        "absl/strings",
-        "absl/strings:str_format",
-        "absl/time",
-        "absl/types:variant",
-    ],
-    deps = [
-        "//:gpr",
-        "//:grpc++_binder",
-    ],
-)
-
-grpc_cc_test(
-    name = "fake_binder_test",
-    srcs = ["fake_binder_test.cc"],
-    external_deps = [
-        "absl/strings",
-        "absl/time",
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    uses_event_engine = False,
-    uses_polling = False,
-    deps = [
-        ":fake_binder",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_cc_library(
-    name = "end2end_binder_channel",
-    testonly = 1,
-    srcs = ["testing_channel_create.cc"],
-    hdrs = ["testing_channel_create.h"],
-    external_deps = ["absl/log:check"],
-    deps = [
-        ":fake_binder",
-        "//:grpc++_base",
-        "//:grpc++_binder",
-        "//:grpc_base",
-        "//src/core:channel_args",
-    ],
-)
-
-grpc_cc_test(
-    name = "end2end_binder_transport_test",
-    srcs = ["end2end_binder_transport_test.cc"],
-    external_deps = [
-        "absl/memory",
-        "absl/time",
-        "gtest",
-    ],
-    flaky = True,
-    language = "C++",
-    tags = [
-        # Flaky on windows
-        "no_windows",
-        "no_mac",
-        "no_test_ios",
-
-        # Known race between stream creation and cancellation
-        "notsan",
-    ],
-    deps = [
-        ":end2end_binder_channel",
-        ":fake_binder",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-        "//test/cpp/end2end:test_service_impl",
-    ],
-)
-
-grpc_cc_test(
-    name = "binder_server_test",
-    srcs = ["binder_server_test.cc"],
-    external_deps = [
-        "gtest",
-    ],
-    tags = ["no_test_ios"],
-    deps = [
-        "//:grpc++",
-        "//:grpc++_binder",
-        "//test/core/test_util:grpc_test_util",
-        "//test/core/transport/binder/end2end:fake_binder",
-        "//test/cpp/end2end:test_service_impl",
-    ],
-)
diff --git a/test/core/transport/binder/end2end/binder_server_test.cc b/test/core/transport/binder/end2end/binder_server_test.cc
deleted file mode 100644
index da17a099e4b..00000000000
--- a/test/core/transport/binder/end2end/binder_server_test.cc
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/server/binder_server.h"
-
-#include <grpcpp/grpcpp.h>
-#include <grpcpp/security/binder_credentials.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <gtest/gtest.h>
-
-#include <memory>
-#include <thread>
-#include <vector>
-
-#include "absl/memory/memory.h"
-#include "src/core/ext/transport/binder/client/channel_create_impl.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/end2end/fake_binder.h"
-#include "test/cpp/end2end/test_service_impl.h"
-
-namespace grpc {
-namespace testing {
-
-namespace {
-
-class BinderServerCredentialsImpl final : public ServerCredentials {
- public:
-  BinderServerCredentialsImpl() : ServerCredentials(nullptr) {}
-
-  int AddPortToServer(const std::string& addr, grpc_server* server) override {
-    return grpc_core::AddBinderPort(
-        addr, server,
-        [](grpc_binder::TransactionReceiver::OnTransactCb transact_cb) {
-          return std::make_unique<
-              grpc_binder::end2end_testing::FakeTransactionReceiver>(
-              nullptr, std::move(transact_cb));
-        },
-        std::make_shared<
-            grpc::experimental::binder::UntrustedSecurityPolicy>());
-  }
-};
-
-}  // namespace
-
-std::shared_ptr<ServerCredentials> BinderServerCredentials() {
-  return std::shared_ptr<ServerCredentials>(new BinderServerCredentialsImpl());
-}
-
-std::shared_ptr<grpc::Channel> CreateBinderChannel(
-    std::unique_ptr<grpc_binder::Binder> endpoint_binder) {
-  return grpc::CreateChannelInternal(
-      "",
-      grpc::internal::CreateDirectBinderChannelImplForTesting(
-          std::move(endpoint_binder), nullptr,
-          std::make_shared<
-              grpc::experimental::binder::UntrustedSecurityPolicy>()),
-      std::vector<std::unique_ptr<
-          grpc::experimental::ClientInterceptorFactoryInterface>>());
-}
-
-}  // namespace testing
-}  // namespace grpc
-
-namespace {
-
-class BinderServerTest : public ::testing::Test {
- public:
-  BinderServerTest() {
-    grpc_binder::end2end_testing::g_transaction_processor =
-        new grpc_binder::end2end_testing::TransactionProcessor();
-  }
-  ~BinderServerTest() override {
-    delete grpc_binder::end2end_testing::g_transaction_processor;
-  }
-  static void SetUpTestSuite() { grpc_init(); }
-  static void TearDownTestSuite() { grpc_shutdown(); }
-};
-
-#ifndef GPR_SUPPORT_BINDER_TRANSPORT
-TEST(BinderServerCredentialsTest,
-     FailedInEnvironmentsNotSupportingBinderTransport) {
-  grpc::ServerBuilder server_builder;
-  grpc::testing::TestServiceImpl service;
-  server_builder.RegisterService(&service);
-  server_builder.AddListeningPort(
-      "binder:fail",
-      grpc::experimental::BinderServerCredentials(
-          std::make_shared<
-              grpc::experimental::binder::UntrustedSecurityPolicy>()));
-  EXPECT_EQ(server_builder.BuildAndStart(), nullptr);
-}
-#endif  // !GPR_SUPPORT_BINDER_TRANSPORT
-
-TEST_F(BinderServerTest, BuildAndStart) {
-  grpc::ServerBuilder server_builder;
-  grpc::testing::TestServiceImpl service;
-  server_builder.RegisterService(&service);
-  server_builder.AddListeningPort("binder:example.service",
-                                  grpc::testing::BinderServerCredentials());
-  std::unique_ptr<grpc::Server> server = server_builder.BuildAndStart();
-  EXPECT_NE(grpc::experimental::binder::GetEndpointBinder("example.service"),
-            nullptr);
-  server->Shutdown();
-  EXPECT_EQ(grpc::experimental::binder::GetEndpointBinder("example.service"),
-            nullptr);
-}
-
-TEST_F(BinderServerTest, BuildAndStartFailed) {
-  grpc::ServerBuilder server_builder;
-  grpc::testing::TestServiceImpl service;
-  server_builder.RegisterService(&service);
-  // Error: binder address should begin with binder:
-  server_builder.AddListeningPort("localhost:12345",
-                                  grpc::testing::BinderServerCredentials());
-  std::unique_ptr<grpc::Server> server = server_builder.BuildAndStart();
-  EXPECT_EQ(server, nullptr);
-}
-
-TEST_F(BinderServerTest, CreateChannelWithEndpointBinder) {
-  grpc::ServerBuilder server_builder;
-  grpc::testing::TestServiceImpl service;
-  server_builder.RegisterService(&service);
-  server_builder.AddListeningPort("binder:example.service",
-                                  grpc::testing::BinderServerCredentials());
-  std::unique_ptr<grpc::Server> server = server_builder.BuildAndStart();
-  void* raw_endpoint_binder =
-      grpc::experimental::binder::GetEndpointBinder("example.service");
-  std::unique_ptr<grpc_binder::Binder> endpoint_binder =
-      std::make_unique<grpc_binder::end2end_testing::FakeBinder>(
-          static_cast<grpc_binder::end2end_testing::FakeEndpoint*>(
-              raw_endpoint_binder));
-  std::shared_ptr<grpc::Channel> channel =
-      grpc::testing::CreateBinderChannel(std::move(endpoint_binder));
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub =
-      grpc::testing::EchoTestService::NewStub(channel);
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  grpc::ClientContext context;
-  request.set_message("BinderServerBuilder");
-  grpc::Status status = stub->Echo(&context, request, &response);
-  EXPECT_TRUE(status.ok());
-  EXPECT_EQ(response.message(), "BinderServerBuilder");
-  server->Shutdown();
-}
-
-TEST_F(BinderServerTest, CreateChannelWithEndpointBinderMultipleConnections) {
-  grpc::ServerBuilder server_builder;
-  grpc::testing::TestServiceImpl service;
-  server_builder.RegisterService(&service);
-  server_builder.AddListeningPort("binder:example.service.multiple.connections",
-                                  grpc::testing::BinderServerCredentials());
-  std::unique_ptr<grpc::Server> server = server_builder.BuildAndStart();
-  void* raw_endpoint_binder = grpc::experimental::binder::GetEndpointBinder(
-      "example.service.multiple.connections");
-  constexpr size_t kNumThreads = 10;
-
-  auto thread_fn = [&](size_t id) {
-    std::unique_ptr<grpc_binder::Binder> endpoint_binder =
-        std::make_unique<grpc_binder::end2end_testing::FakeBinder>(
-            static_cast<grpc_binder::end2end_testing::FakeEndpoint*>(
-                raw_endpoint_binder));
-    std::shared_ptr<grpc::Channel> channel =
-        grpc::testing::CreateBinderChannel(std::move(endpoint_binder));
-    std::unique_ptr<grpc::testing::EchoTestService::Stub> stub =
-        grpc::testing::EchoTestService::NewStub(channel);
-    grpc::testing::EchoRequest request;
-    grpc::testing::EchoResponse response;
-    grpc::ClientContext context;
-    request.set_message(absl::StrFormat("BinderServerBuilder-%d", id));
-    grpc::Status status = stub->Echo(&context, request, &response);
-    EXPECT_TRUE(status.ok());
-    EXPECT_EQ(response.message(),
-              absl::StrFormat("BinderServerBuilder-%d", id));
-  };
-
-  std::vector<std::thread> threads(kNumThreads);
-  for (size_t i = 0; i < kNumThreads; ++i) {
-    threads[i] = std::thread(thread_fn, i);
-  }
-  for (auto& thr : threads) {
-    thr.join();
-  }
-  server->Shutdown();
-}
-
-TEST_F(BinderServerTest, CreateChannelWithEndpointBinderParallelRequests) {
-  grpc::ServerBuilder server_builder;
-  grpc::testing::TestServiceImpl service;
-  server_builder.RegisterService(&service);
-  server_builder.AddListeningPort("binder:example.service",
-                                  grpc::testing::BinderServerCredentials());
-  std::unique_ptr<grpc::Server> server = server_builder.BuildAndStart();
-  void* raw_endpoint_binder =
-      grpc::experimental::binder::GetEndpointBinder("example.service");
-  std::unique_ptr<grpc_binder::Binder> endpoint_binder =
-      std::make_unique<grpc_binder::end2end_testing::FakeBinder>(
-          static_cast<grpc_binder::end2end_testing::FakeEndpoint*>(
-              raw_endpoint_binder));
-  std::shared_ptr<grpc::Channel> channel =
-      grpc::testing::CreateBinderChannel(std::move(endpoint_binder));
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub =
-      grpc::testing::EchoTestService::NewStub(channel);
-
-  constexpr size_t kNumRequests = 10;
-
-  auto thread_fn = [&](size_t id) {
-    grpc::testing::EchoRequest request;
-    std::string msg = absl::StrFormat("BinderServerBuilder-%d", id);
-    request.set_message(msg);
-    grpc::testing::EchoResponse response;
-    grpc::ClientContext context;
-    grpc::Status status = stub->Echo(&context, request, &response);
-    EXPECT_TRUE(status.ok());
-    EXPECT_EQ(response.message(), msg);
-  };
-  std::vector<std::thread> threads(kNumRequests);
-  for (size_t i = 0; i < kNumRequests; ++i) {
-    threads[i] = std::thread(thread_fn, i);
-  }
-  for (auto& thr : threads) {
-    thr.join();
-  }
-  server->Shutdown();
-}
-
-}  // namespace
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc b/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
deleted file mode 100644
index bc8f7be9078..00000000000
--- a/test/core/transport/binder/end2end/end2end_binder_transport_test.cc
+++ /dev/null
@@ -1,566 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <gmock/gmock.h>
-#include <grpcpp/grpcpp.h>
-#include <gtest/gtest.h>
-
-#include <string>
-#include <thread>
-#include <utility>
-
-#include "absl/memory/memory.h"
-#include "absl/time/time.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/end2end/fake_binder.h"
-#include "test/core/transport/binder/end2end/testing_channel_create.h"
-#include "test/cpp/end2end/test_service_impl.h"
-
-namespace grpc_binder {
-
-namespace {
-
-class End2EndBinderTransportTest
-    : public ::testing::TestWithParam<absl::Duration> {
- public:
-  End2EndBinderTransportTest() {
-    end2end_testing::g_transaction_processor =
-        new end2end_testing::TransactionProcessor(GetParam());
-    service_ = std::make_unique<grpc::testing::TestServiceImpl>();
-    grpc::ServerBuilder builder;
-    builder.RegisterService(service_.get());
-    server_ = builder.BuildAndStart();
-  }
-
-  ~End2EndBinderTransportTest() override {
-    server_->Shutdown();
-    service_.reset();
-    exec_ctx.Flush();
-    delete end2end_testing::g_transaction_processor;
-  }
-
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> NewStub() {
-    grpc::ChannelArguments args;
-    std::shared_ptr<grpc::Channel> channel = BinderChannel(server_.get(), args);
-    return grpc::testing::EchoTestService::NewStub(channel);
-  }
-
-  static void SetUpTestSuite() { grpc_init(); }
-  static void TearDownTestSuite() { grpc_shutdown(); }
-
-  std::shared_ptr<grpc::Channel> BinderChannel(
-      grpc::Server* server, const grpc::ChannelArguments& args) {
-    return end2end_testing::BinderChannelForTesting(server, args);
-  }
-
- protected:
-  std::unique_ptr<grpc::testing::TestServiceImpl> service_;
-  std::unique_ptr<grpc::Server> server_;
-
- private:
-  grpc_core::ExecCtx exec_ctx;
-};
-
-}  // namespace
-
-TEST_P(End2EndBinderTransportTest, SetupTransport) {
-  grpc_core::Transport *client_transport, *server_transport;
-  std::tie(client_transport, server_transport) =
-      end2end_testing::CreateClientServerBindersPairForTesting();
-  EXPECT_NE(client_transport, nullptr);
-  EXPECT_NE(server_transport, nullptr);
-
-  client_transport->Orphan();
-  server_transport->Orphan();
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCall) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCall");
-  grpc::Status status = stub->Echo(&context, request, &response);
-  EXPECT_TRUE(status.ok());
-  EXPECT_EQ(response.message(), "UnaryCall");
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallWithNonOkStatus) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallWithNonOkStatus");
-  request.mutable_param()->mutable_expected_error()->set_code(
-      grpc::StatusCode::INTERNAL);
-  request.mutable_param()->mutable_expected_error()->set_error_message(
-      "expected to fail");
-  // Server will not response the client with message data, however, since all
-  // callbacks after the trailing metadata are cancelled, we shall not be
-  // blocked here.
-  grpc::Status status = stub->Echo(&context, request, &response);
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::INTERNAL);
-  EXPECT_THAT(status.error_message(), ::testing::HasSubstr("expected to fail"));
-}
-
-// Disabled because the test is ~0.01% flaky
-TEST_P(End2EndBinderTransportTest, DISABLED_UnaryCallServerTimeout) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  context.set_deadline(absl::ToChronoTime(
-      absl::Now() + (absl::Seconds(1) * grpc_test_slowdown_factor())));
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallServerTimeout");
-  // Server will sleep for 2 seconds before responding us.
-  request.mutable_param()->set_server_sleep_us(2000000);
-  // Disable cancellation check because the request will time out.
-  request.mutable_param()->set_skip_cancelled_check(true);
-  grpc::Status status = stub->Echo(&context, request, &response);
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::DEADLINE_EXCEEDED);
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallClientTimeout) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-
-  // Set transaction delay to a large number. This happens after the channel
-  // creation so that we don't need to wait that long for client and server to
-  // be connected.
-  end2end_testing::g_transaction_processor->SetDelay(absl::Seconds(5));
-
-  grpc::ClientContext context;
-  context.set_deadline(absl::ToChronoTime(absl::Now() + absl::Seconds(1)));
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallClientTimeout");
-  grpc::Status status = stub->Echo(&context, request, &response);
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::DEADLINE_EXCEEDED);
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallUnimplemented) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-
-  grpc::ClientContext context;
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallUnimplemented");
-  grpc::Status status = stub->Unimplemented(&context, request, &response);
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::UNIMPLEMENTED);
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallClientCancel) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-
-  grpc::ClientContext context;
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallClientCancel");
-  context.TryCancel();
-  grpc::Status status = stub->Unimplemented(&context, request, &response);
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallEchoMetadataInitially) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-
-  grpc::ClientContext context;
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallEchoMetadataInitially");
-  request.mutable_param()->set_echo_metadata_initially(true);
-  context.AddMetadata("key1", "value1");
-  context.AddMetadata("key2", "value2");
-  grpc::Status status = stub->Echo(&context, request, &response);
-  const auto& initial_metadata = context.GetServerInitialMetadata();
-  EXPECT_EQ(initial_metadata.find("key1")->second, "value1");
-  EXPECT_EQ(initial_metadata.find("key2")->second, "value2");
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallEchoMetadata) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-
-  grpc::ClientContext context;
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallEchoMetadata");
-  request.mutable_param()->set_echo_metadata(true);
-  context.AddMetadata("key1", "value1");
-  context.AddMetadata("key2", "value2");
-  grpc::Status status = stub->Echo(&context, request, &response);
-  const auto& initial_metadata = context.GetServerTrailingMetadata();
-  EXPECT_EQ(initial_metadata.find("key1")->second, "value1");
-  EXPECT_EQ(initial_metadata.find("key2")->second, "value2");
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallResponseMessageLength) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-
-  for (size_t response_length : {1, 2, 5, 10, 100, 1000000}) {
-    grpc::ClientContext context;
-    grpc::testing::EchoRequest request;
-    grpc::testing::EchoResponse response;
-    request.set_message("UnaryCallResponseMessageLength");
-    request.mutable_param()->set_response_message_length(response_length);
-    grpc::Status status = stub->Echo(&context, request, &response);
-    EXPECT_EQ(response.message().length(), response_length);
-  }
-}
-
-TEST_P(End2EndBinderTransportTest, UnaryCallTryCancel) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerTryCancelRequest,
-                      std::to_string(grpc::testing::CANCEL_BEFORE_PROCESSING));
-  grpc::testing::EchoRequest request;
-  grpc::testing::EchoResponse response;
-  request.set_message("UnaryCallTryCancel");
-  grpc::Status status = stub->Echo(&context, request, &response);
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-TEST_P(End2EndBinderTransportTest, ServerStreamingCall) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  constexpr size_t kServerResponseStreamsToSend = 100;
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerResponseStreamsToSend,
-                      std::to_string(kServerResponseStreamsToSend));
-  grpc::testing::EchoRequest request;
-  request.set_message("ServerStreamingCall");
-  std::unique_ptr<grpc::ClientReader<grpc::testing::EchoResponse>> reader =
-      stub->ResponseStream(&context, request);
-  grpc::testing::EchoResponse response;
-  size_t cnt = 0;
-  while (reader->Read(&response)) {
-    EXPECT_EQ(response.message(), "ServerStreamingCall" + std::to_string(cnt));
-    cnt++;
-  }
-  EXPECT_EQ(cnt, kServerResponseStreamsToSend);
-  grpc::Status status = reader->Finish();
-  EXPECT_TRUE(status.ok());
-}
-
-TEST_P(End2EndBinderTransportTest, ServerStreamingCallCoalescingApi) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  constexpr size_t kServerResponseStreamsToSend = 100;
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerResponseStreamsToSend,
-                      std::to_string(kServerResponseStreamsToSend));
-  context.AddMetadata(grpc::testing::kServerUseCoalescingApi, "1");
-  grpc::testing::EchoRequest request;
-  request.set_message("ServerStreamingCallCoalescingApi");
-  std::unique_ptr<grpc::ClientReader<grpc::testing::EchoResponse>> reader =
-      stub->ResponseStream(&context, request);
-  grpc::testing::EchoResponse response;
-  size_t cnt = 0;
-  while (reader->Read(&response)) {
-    EXPECT_EQ(response.message(),
-              "ServerStreamingCallCoalescingApi" + std::to_string(cnt));
-    cnt++;
-  }
-  EXPECT_EQ(cnt, kServerResponseStreamsToSend);
-  grpc::Status status = reader->Finish();
-  EXPECT_TRUE(status.ok());
-}
-
-TEST_P(End2EndBinderTransportTest,
-       ServerStreamingCallTryCancelBeforeProcessing) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  constexpr size_t kServerResponseStreamsToSend = 100;
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerResponseStreamsToSend,
-                      std::to_string(kServerResponseStreamsToSend));
-  context.AddMetadata(grpc::testing::kServerTryCancelRequest,
-                      std::to_string(grpc::testing::CANCEL_BEFORE_PROCESSING));
-  grpc::testing::EchoRequest request;
-  request.set_message("ServerStreamingCallTryCancelBeforeProcessing");
-  std::unique_ptr<grpc::ClientReader<grpc::testing::EchoResponse>> reader =
-      stub->ResponseStream(&context, request);
-  grpc::testing::EchoResponse response;
-  EXPECT_FALSE(reader->Read(&response));
-  grpc::Status status = reader->Finish();
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-TEST_P(End2EndBinderTransportTest,
-       ServerSteramingCallTryCancelDuringProcessing) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  constexpr size_t kServerResponseStreamsToSend = 2;
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerResponseStreamsToSend,
-                      std::to_string(kServerResponseStreamsToSend));
-  context.AddMetadata(grpc::testing::kServerTryCancelRequest,
-                      std::to_string(grpc::testing::CANCEL_DURING_PROCESSING));
-  grpc::testing::EchoRequest request;
-  request.set_message("ServerStreamingCallTryCancelDuringProcessing");
-  std::unique_ptr<grpc::ClientReader<grpc::testing::EchoResponse>> reader =
-      stub->ResponseStream(&context, request);
-  grpc::testing::EchoResponse response;
-  size_t cnt = 0;
-  while (reader->Read(&response)) {
-    EXPECT_EQ(
-        response.message(),
-        "ServerStreamingCallTryCancelDuringProcessing" + std::to_string(cnt));
-    cnt++;
-  }
-  grpc::Status status = reader->Finish();
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-TEST_P(End2EndBinderTransportTest,
-       ServerSteramingCallTryCancelAfterProcessing) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  constexpr size_t kServerResponseStreamsToSend = 100;
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerResponseStreamsToSend,
-                      std::to_string(kServerResponseStreamsToSend));
-  context.AddMetadata(grpc::testing::kServerTryCancelRequest,
-                      std::to_string(grpc::testing::CANCEL_AFTER_PROCESSING));
-  grpc::testing::EchoRequest request;
-  request.set_message("ServerStreamingCallTryCancelAfterProcessing");
-  std::unique_ptr<grpc::ClientReader<grpc::testing::EchoResponse>> reader =
-      stub->ResponseStream(&context, request);
-  grpc::testing::EchoResponse response;
-  size_t cnt = 0;
-  while (reader->Read(&response)) {
-    EXPECT_EQ(
-        response.message(),
-        "ServerStreamingCallTryCancelAfterProcessing" + std::to_string(cnt));
-    cnt++;
-  }
-  EXPECT_EQ(cnt, kServerResponseStreamsToSend);
-  grpc::Status status = reader->Finish();
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-TEST_P(End2EndBinderTransportTest, ClientStreamingCall) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  grpc::testing::EchoResponse response;
-  std::unique_ptr<grpc::ClientWriter<grpc::testing::EchoRequest>> writer =
-      stub->RequestStream(&context, &response);
-  constexpr size_t kClientStreamingCounts = 100;
-  std::string expected;
-  for (size_t i = 0; i < kClientStreamingCounts; ++i) {
-    grpc::testing::EchoRequest request;
-    request.set_message("ClientStreamingCall" + std::to_string(i));
-    EXPECT_TRUE(writer->Write(request));
-    expected += "ClientStreamingCall" + std::to_string(i);
-  }
-  writer->WritesDone();
-  grpc::Status status = writer->Finish();
-  EXPECT_TRUE(status.ok());
-  EXPECT_EQ(response.message(), expected);
-}
-
-// Disabled because the test case is ~0.002% flaky
-TEST_P(End2EndBinderTransportTest,
-       DISABLED_ClientStreamingCallTryCancelBeforeProcessing) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerTryCancelRequest,
-                      std::to_string(grpc::testing::CANCEL_BEFORE_PROCESSING));
-  grpc::testing::EchoResponse response;
-  std::unique_ptr<grpc::ClientWriter<grpc::testing::EchoRequest>> writer =
-      stub->RequestStream(&context, &response);
-  constexpr size_t kClientStreamingCounts = 100;
-  for (size_t i = 0; i < kClientStreamingCounts; ++i) {
-    grpc::testing::EchoRequest request;
-    request.set_message("ClientStreamingCallBeforeProcessing" +
-                        std::to_string(i));
-    writer->Write(request);
-  }
-  writer->WritesDone();
-  grpc::Status status = writer->Finish();
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-// Disabled because the test case is ~0.002% flaky
-TEST_P(End2EndBinderTransportTest,
-       DISABLED_ClientStreamingCallTryCancelDuringProcessing) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerTryCancelRequest,
-                      std::to_string(grpc::testing::CANCEL_DURING_PROCESSING));
-  grpc::testing::EchoResponse response;
-  std::unique_ptr<grpc::ClientWriter<grpc::testing::EchoRequest>> writer =
-      stub->RequestStream(&context, &response);
-  constexpr size_t kClientStreamingCounts = 100;
-  for (size_t i = 0; i < kClientStreamingCounts; ++i) {
-    grpc::testing::EchoRequest request;
-    request.set_message("ClientStreamingCallDuringProcessing" +
-                        std::to_string(i));
-    writer->Write(request);
-  }
-  writer->WritesDone();
-  grpc::Status status = writer->Finish();
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-TEST_P(End2EndBinderTransportTest,
-       ClientStreamingCallTryCancelAfterProcessing) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerTryCancelRequest,
-                      std::to_string(grpc::testing::CANCEL_AFTER_PROCESSING));
-  grpc::testing::EchoResponse response;
-  std::unique_ptr<grpc::ClientWriter<grpc::testing::EchoRequest>> writer =
-      stub->RequestStream(&context, &response);
-  constexpr size_t kClientStreamingCounts = 100;
-  for (size_t i = 0; i < kClientStreamingCounts; ++i) {
-    grpc::testing::EchoRequest request;
-    request.set_message("ClientStreamingCallAfterProcessing" +
-                        std::to_string(i));
-    writer->Write(request);
-  }
-  writer->WritesDone();
-  grpc::Status status = writer->Finish();
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ(status.error_code(), grpc::StatusCode::CANCELLED);
-}
-
-TEST_P(End2EndBinderTransportTest, BiDirStreamingCall) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  grpc::ClientContext context;
-  std::shared_ptr<grpc::ClientReaderWriter<grpc::testing::EchoRequest,
-                                           grpc::testing::EchoResponse>>
-      stream = stub->BidiStream(&context);
-  constexpr size_t kBiDirStreamingCounts = 100;
-
-  struct WriterArgs {
-    std::shared_ptr<grpc::ClientReaderWriter<grpc::testing::EchoRequest,
-                                             grpc::testing::EchoResponse>>
-        stream;
-    size_t bi_dir_streaming_counts;
-  } writer_args;
-
-  writer_args.stream = stream;
-  writer_args.bi_dir_streaming_counts = kBiDirStreamingCounts;
-
-  auto writer_fn = [](void* arg) {
-    const WriterArgs& args = *static_cast<WriterArgs*>(arg);
-    for (size_t i = 0; i < args.bi_dir_streaming_counts; ++i) {
-      grpc::testing::EchoRequest request;
-      request.set_message("BiDirStreamingCall" + std::to_string(i));
-      args.stream->Write(request);
-    }
-    args.stream->WritesDone();
-  };
-
-  grpc_core::Thread writer_thread("writer-thread", writer_fn,
-                                  static_cast<void*>(&writer_args));
-  writer_thread.Start();
-  for (size_t i = 0; i < kBiDirStreamingCounts; ++i) {
-    grpc::testing::EchoResponse response;
-    EXPECT_TRUE(stream->Read(&response));
-    EXPECT_EQ(response.message(), "BiDirStreamingCall" + std::to_string(i));
-  }
-  grpc::Status status = stream->Finish();
-  EXPECT_TRUE(status.ok());
-  writer_thread.Join();
-}
-
-// Disabled because the test case is ~0.01% flaky
-TEST_P(End2EndBinderTransportTest,
-       DISABLED_BiDirStreamingCallServerFinishesHalfway) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  constexpr size_t kBiDirStreamingCounts = 100;
-  grpc::ClientContext context;
-  context.AddMetadata(grpc::testing::kServerFinishAfterNReads,
-                      std::to_string(kBiDirStreamingCounts / 2));
-  std::shared_ptr<grpc::ClientReaderWriter<grpc::testing::EchoRequest,
-                                           grpc::testing::EchoResponse>>
-      stream = stub->BidiStream(&context);
-
-  struct WriterArgs {
-    std::shared_ptr<grpc::ClientReaderWriter<grpc::testing::EchoRequest,
-                                             grpc::testing::EchoResponse>>
-        stream;
-    size_t bi_dir_streaming_counts;
-  } writer_args;
-
-  writer_args.stream = stream;
-  writer_args.bi_dir_streaming_counts = kBiDirStreamingCounts;
-
-  auto writer_fn = [](void* arg) {
-    const WriterArgs& args = *static_cast<WriterArgs*>(arg);
-    for (size_t i = 0; i < args.bi_dir_streaming_counts; ++i) {
-      grpc::testing::EchoRequest request;
-      request.set_message("BiDirStreamingCallServerFinishesHalfway" +
-                          std::to_string(i));
-      if (!args.stream->Write(request)) {
-        return;
-      }
-    }
-    args.stream->WritesDone();
-  };
-
-  grpc_core::Thread writer_thread("writer-thread", writer_fn,
-                                  static_cast<void*>(&writer_args));
-  writer_thread.Start();
-  for (size_t i = 0; i < kBiDirStreamingCounts / 2; ++i) {
-    grpc::testing::EchoResponse response;
-    EXPECT_TRUE(stream->Read(&response));
-    EXPECT_EQ(response.message(),
-              "BiDirStreamingCallServerFinishesHalfway" + std::to_string(i));
-  }
-  grpc::testing::EchoResponse response;
-  EXPECT_FALSE(stream->Read(&response));
-  writer_thread.Join();
-  grpc::Status status = stream->Finish();
-  EXPECT_TRUE(status.ok());
-}
-
-TEST_P(End2EndBinderTransportTest, LargeMessages) {
-  std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = NewStub();
-  for (size_t size = 1; size <= 1024 * 1024; size *= 4) {
-    grpc::ClientContext context;
-    grpc::testing::EchoRequest request;
-    grpc::testing::EchoResponse response;
-    request.set_message(std::string(size, 'a'));
-    grpc::Status status = stub->Echo(&context, request, &response);
-    EXPECT_TRUE(status.ok());
-    EXPECT_EQ(response.message().size(), size);
-    EXPECT_TRUE(std::all_of(response.message().begin(),
-                            response.message().end(),
-                            [](char c) { return c == 'a'; }));
-  }
-}
-
-INSTANTIATE_TEST_SUITE_P(End2EndBinderTransportTestWithDifferentDelayTimes,
-                         End2EndBinderTransportTest,
-                         testing::Values(absl::ZeroDuration(),
-                                         absl::Microseconds(10),
-                                         absl::Milliseconds(10)));
-
-}  // namespace grpc_binder
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/binder/end2end/fake_binder.cc b/test/core/transport/binder/end2end/fake_binder.cc
deleted file mode 100644
index d3e93f50ada..00000000000
--- a/test/core/transport/binder/end2end/fake_binder.cc
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "test/core/transport/binder/end2end/fake_binder.h"
-
-#include <string>
-#include <utility>
-
-#include "absl/log/log.h"
-#include "src/core/util/crash.h"
-
-namespace grpc_binder {
-namespace end2end_testing {
-
-TransactionProcessor* g_transaction_processor = nullptr;
-
-int32_t FakeWritableParcel::GetDataSize() const { return data_size_; }
-
-absl::Status FakeWritableParcel::WriteInt32(int32_t data) {
-  data_.push_back(data);
-  data_size_ += sizeof(int32_t);
-  return absl::OkStatus();
-}
-
-absl::Status FakeWritableParcel::WriteInt64(int64_t data) {
-  data_.push_back(data);
-  data_size_ += sizeof(int64_t);
-  return absl::OkStatus();
-}
-
-absl::Status FakeWritableParcel::WriteBinder(HasRawBinder* binder) {
-  data_.push_back(binder->GetRawBinder());
-  data_size_ += sizeof(void*);
-  return absl::OkStatus();
-}
-
-absl::Status FakeWritableParcel::WriteString(absl::string_view s) {
-  data_.push_back(std::string(s));
-  data_size_ += s.size();
-  return absl::OkStatus();
-}
-
-absl::Status FakeWritableParcel::WriteByteArray(const int8_t* buffer,
-                                                int32_t length) {
-  data_.push_back(std::vector<int8_t>(buffer, buffer + length));
-  data_size_ += length;
-  return absl::OkStatus();
-}
-
-int32_t FakeReadableParcel::GetDataSize() const { return data_size_; }
-
-absl::Status FakeReadableParcel::ReadInt32(int32_t* data) {
-  if (data_position_ >= data_.size() ||
-      !absl::holds_alternative<int32_t>(data_[data_position_])) {
-    return absl::InternalError("ReadInt32 failed");
-  }
-  *data = absl::get<int32_t>(data_[data_position_++]);
-  return absl::OkStatus();
-}
-
-absl::Status FakeReadableParcel::ReadInt64(int64_t* data) {
-  if (data_position_ >= data_.size() ||
-      !absl::holds_alternative<int64_t>(data_[data_position_])) {
-    return absl::InternalError("ReadInt64 failed");
-  }
-  *data = absl::get<int64_t>(data_[data_position_++]);
-  return absl::OkStatus();
-}
-
-absl::Status FakeReadableParcel::ReadBinder(std::unique_ptr<Binder>* data) {
-  if (data_position_ >= data_.size() ||
-      !absl::holds_alternative<void*>(data_[data_position_])) {
-    return absl::InternalError("ReadBinder failed");
-  }
-  void* endpoint = absl::get<void*>(data_[data_position_++]);
-  if (!endpoint) return absl::InternalError("ReadBinder failed");
-  *data = std::make_unique<FakeBinder>(static_cast<FakeEndpoint*>(endpoint));
-  return absl::OkStatus();
-}
-
-absl::Status FakeReadableParcel::ReadString(std::string* str) {
-  if (data_position_ >= data_.size() ||
-      !absl::holds_alternative<std::string>(data_[data_position_])) {
-    return absl::InternalError("ReadString failed");
-  }
-  *str = absl::get<std::string>(data_[data_position_++]);
-  return absl::OkStatus();
-}
-
-absl::Status FakeReadableParcel::ReadByteArray(std::string* data) {
-  if (data_position_ >= data_.size() ||
-      !absl::holds_alternative<std::vector<int8_t>>(data_[data_position_])) {
-    return absl::InternalError("ReadByteArray failed");
-  }
-  const std::vector<int8_t>& byte_array =
-      absl::get<std::vector<int8_t>>(data_[data_position_++]);
-  data->resize(byte_array.size());
-  for (size_t i = 0; i < byte_array.size(); ++i) {
-    (*data)[i] = byte_array[i];
-  }
-  return absl::OkStatus();
-}
-
-absl::Status FakeBinder::Transact(BinderTransportTxCode tx_code) {
-  endpoint_->tunnel->EnQueueTransaction(endpoint_->other_end, tx_code,
-                                        input_->MoveData());
-  return absl::OkStatus();
-}
-
-FakeTransactionReceiver::FakeTransactionReceiver(
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb transact_cb) {
-  persistent_tx_receiver_ = &g_transaction_processor->NewPersistentTxReceiver(
-      std::move(wire_reader_ref), std::move(transact_cb),
-      std::make_unique<FakeBinderTunnel>());
-}
-
-std::unique_ptr<TransactionReceiver> FakeBinder::ConstructTxReceiver(
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb cb) const {
-  return std::make_unique<FakeTransactionReceiver>(wire_reader_ref, cb);
-}
-
-void* FakeTransactionReceiver::GetRawBinder() {
-  return persistent_tx_receiver_->tunnel_->GetSendEndpoint();
-}
-
-std::unique_ptr<Binder> FakeTransactionReceiver::GetSender() const {
-  return std::make_unique<FakeBinder>(
-      persistent_tx_receiver_->tunnel_->GetSendEndpoint());
-}
-
-PersistentFakeTransactionReceiver::PersistentFakeTransactionReceiver(
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb cb,
-    std::unique_ptr<FakeBinderTunnel> tunnel)
-    : wire_reader_ref_(std::move(wire_reader_ref)),
-      callback_(std::move(cb)),
-      tunnel_(std::move(tunnel)) {
-  FakeEndpoint* recv_endpoint = tunnel_->GetRecvEndpoint();
-  recv_endpoint->owner = this;
-}
-
-TransactionProcessor::TransactionProcessor(absl::Duration delay)
-    : delay_nsec_(absl::ToInt64Nanoseconds(delay)),
-      tx_thread_(
-          "process-thread",
-          [](void* arg) {
-            grpc_core::ExecCtx exec_ctx;
-            auto* self = static_cast<TransactionProcessor*>(arg);
-            self->ProcessLoop();
-          },
-          this),
-      terminated_(false) {
-  tx_thread_.Start();
-}
-
-void TransactionProcessor::SetDelay(absl::Duration delay) {
-  delay_nsec_ = absl::ToInt64Nanoseconds(delay);
-}
-
-void TransactionProcessor::Terminate() {
-  if (!terminated_.load(std::memory_order_seq_cst)) {
-    LOG(INFO) << "Terminating the processor";
-    terminated_.store(true, std::memory_order_seq_cst);
-    tx_thread_.Join();
-    LOG(INFO) << "Processor terminated";
-  }
-}
-
-void TransactionProcessor::WaitForNextTransaction() {
-  absl::Time now = absl::Now();
-  if (now < deliver_time_) {
-    absl::Duration diff = deliver_time_ - now;
-    // Release the lock before going to sleep.
-    mu_.Unlock();
-    absl::SleepFor(diff);
-    mu_.Lock();
-  }
-}
-
-void TransactionProcessor::Flush() {
-  while (true) {
-    FakeEndpoint* target = nullptr;
-    BinderTransportTxCode tx_code{};
-    FakeData data;
-    mu_.Lock();
-    if (tx_queue_.empty()) {
-      mu_.Unlock();
-      break;
-    }
-    WaitForNextTransaction();
-    std::tie(target, tx_code, data) = std::move(tx_queue_.front());
-    tx_queue_.pop();
-    if (!tx_queue_.empty()) {
-      deliver_time_ = absl::Now() + GetRandomDelay();
-    }
-    mu_.Unlock();
-    auto* tx_receiver =
-        static_cast<PersistentFakeTransactionReceiver*>(target->owner);
-    auto parcel = std::make_unique<FakeReadableParcel>(std::move(data));
-    tx_receiver->Receive(tx_code, parcel.get()).IgnoreError();
-  }
-}
-
-void TransactionProcessor::ProcessLoop() {
-  while (!terminated_.load(std::memory_order_seq_cst)) {
-    FakeEndpoint* target = nullptr;
-    BinderTransportTxCode tx_code{};
-    FakeData data;
-    mu_.Lock();
-    if (tx_queue_.empty()) {
-      mu_.Unlock();
-      continue;
-    }
-    WaitForNextTransaction();
-    std::tie(target, tx_code, data) = std::move(tx_queue_.front());
-    tx_queue_.pop();
-    if (!tx_queue_.empty()) {
-      deliver_time_ = absl::Now() + GetRandomDelay();
-    }
-    mu_.Unlock();
-    auto* tx_receiver =
-        static_cast<PersistentFakeTransactionReceiver*>(target->owner);
-    auto parcel = std::make_unique<FakeReadableParcel>(std::move(data));
-    tx_receiver->Receive(tx_code, parcel.get()).IgnoreError();
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-  Flush();
-}
-
-absl::Duration TransactionProcessor::GetRandomDelay() {
-  int64_t delay =
-      absl::Uniform<int64_t>(bit_gen_, delay_nsec_ / 2, delay_nsec_);
-  return absl::Nanoseconds(delay);
-}
-
-void TransactionProcessor::EnQueueTransaction(FakeEndpoint* target,
-                                              BinderTransportTxCode tx_code,
-                                              FakeData data) {
-  grpc_core::MutexLock lock(&mu_);
-  if (tx_queue_.empty()) {
-    // This is the first transaction in the queue. Compute its deliver time.
-    deliver_time_ = absl::Now() + GetRandomDelay();
-  }
-  tx_queue_.emplace(target, tx_code, std::move(data));
-}
-
-FakeBinderTunnel::FakeBinderTunnel()
-    : send_endpoint_(std::make_unique<FakeEndpoint>(this)),
-      recv_endpoint_(std::make_unique<FakeEndpoint>(this)) {
-  send_endpoint_->other_end = recv_endpoint_.get();
-  recv_endpoint_->other_end = send_endpoint_.get();
-}
-
-std::pair<std::unique_ptr<Binder>, std::unique_ptr<TransactionReceiver>>
-NewBinderPair(TransactionReceiver::OnTransactCb transact_cb) {
-  auto tx_receiver = std::make_unique<FakeTransactionReceiver>(
-      nullptr, std::move(transact_cb));
-  std::unique_ptr<Binder> sender = tx_receiver->GetSender();
-  return std::make_pair(std::move(sender), std::move(tx_receiver));
-}
-
-}  // namespace end2end_testing
-}  // namespace grpc_binder
diff --git a/test/core/transport/binder/end2end/fake_binder.h b/test/core/transport/binder/end2end/fake_binder.h
deleted file mode 100644
index 46877bfb9de..00000000000
--- a/test/core/transport/binder/end2end/fake_binder.h
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// A collection of fake objects that offers in-memory simulation of data
-// transmission from one binder to another.
-//
-// Once the implementation of Binder is changed from BinderAndroid to
-// FakeBinder, we'll be able to test and fuzz our end-to-end binder transport in
-// a non-Android environment.
-//
-// The following diagram shows the high-level overview of how the in-memory
-// simulation works (FakeReceiver means FakeTransactionReceiver).
-//
-//                                        thread boundary
-//                                                |
-//                                                |
-// ----------------           ----------------    |  receive
-// |  FakeBinder  |           | FakeReceiver | <--|----------------
-// ----------------           ----------------    |               |
-//        |                           ^           |   ------------------------
-//        | endpoint            owner |           |   | TransactionProcessor |
-//        |                           |           |   ------------------------
-//        v                           |           |               ^
-// ----------------           ----------------    |               |
-// | FakeEndpoint | --------> | FakeEndpoint | ---|----------------
-// ---------------- other_end ----------------    |  enqueue
-//       | ^                         ^ |          |
-//       | |           recv_endpoint | |          |
-//       | |                         | |
-//       | | send_endpoint           | |
-//       v |                         | v
-// -------------------------------------------
-// |             FakeBinderTunnel            |
-// -------------------------------------------
-
-#ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_FAKE_BINDER_H
-#define GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_FAKE_BINDER_H
-
-#include <atomic>
-#include <forward_list>
-#include <memory>
-#include <queue>
-#include <string>
-#include <thread>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-#include "absl/memory/memory.h"
-#include "absl/random/random.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-#include "absl/time/time.h"
-#include "absl/types/variant.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-#include "src/core/util/sync.h"
-#include "src/core/util/thd.h"
-
-namespace grpc_binder {
-namespace end2end_testing {
-
-using FakeData = std::vector<
-    absl::variant<int32_t, int64_t, void*, std::string, std::vector<int8_t>>>;
-
-// A fake writable parcel.
-//
-// It simulates the functionalities of a real writable parcel and stores all
-// written data in memory. The data can then be transferred by calling
-// MoveData().
-class FakeWritableParcel final : public WritableParcel {
- public:
-  int32_t GetDataSize() const override;
-  absl::Status WriteInt32(int32_t data) override;
-  absl::Status WriteInt64(int64_t data) override;
-  absl::Status WriteBinder(HasRawBinder* binder) override;
-  absl::Status WriteString(absl::string_view s) override;
-  absl::Status WriteByteArray(const int8_t* buffer, int32_t length) override;
-
-  FakeData MoveData() { return std::move(data_); }
-
- private:
-  FakeData data_;
-  int32_t data_size_ = 0;
-};
-
-// A fake readable parcel.
-//
-// It takes in the data transferred from a FakeWritableParcel and provides
-// methods to retrieve those data in the receiving end.
-class FakeReadableParcel final : public ReadableParcel {
- public:
-  explicit FakeReadableParcel(FakeData data) : data_(std::move(data)) {
-    for (auto& d : data_) {
-      if (absl::holds_alternative<int32_t>(d)) {
-        data_size_ += sizeof(int32_t);
-      } else if (absl::holds_alternative<int64_t>(d)) {
-        data_size_ += sizeof(int64_t);
-      } else if (absl::holds_alternative<void*>(d)) {
-        data_size_ += sizeof(void*);
-      } else if (absl::holds_alternative<std::string>(d)) {
-        data_size_ += absl::get<std::string>(d).size();
-      } else {
-        data_size_ += absl::get<std::vector<int8_t>>(d).size();
-      }
-    }
-  }
-
-  int32_t GetDataSize() const override;
-  absl::Status ReadInt32(int32_t* data) override;
-  absl::Status ReadInt64(int64_t* data) override;
-  absl::Status ReadBinder(std::unique_ptr<Binder>* data) override;
-  absl::Status ReadByteArray(std::string* data) override;
-  absl::Status ReadString(std::string* str) override;
-
- private:
-  const FakeData data_;
-  size_t data_position_ = 0;
-  int32_t data_size_ = 0;
-};
-
-class FakeBinder;
-class FakeBinderTunnel;
-
-// FakeEndpoint is a simple struct that holds the pointer to the other end, a
-// pointer to the tunnel and a pointer to its owner. This tells the owner where
-// the data should be sent.
-struct FakeEndpoint {
-  explicit FakeEndpoint(FakeBinderTunnel* tunnel) : tunnel(tunnel) {}
-
-  FakeEndpoint* other_end;
-  FakeBinderTunnel* tunnel;
-  // The owner is either a FakeBinder (the sending part) or a
-  // FakeTransactionReceiver (the receiving part). Both parts hold an endpoint
-  // with |owner| pointing back to them and |other_end| pointing to each other.
-  void* owner;
-};
-
-class PersistentFakeTransactionReceiver;
-
-// A fake transaction receiver.
-//
-// This is the receiving part of a pair of binders. When constructed, a binder
-// tunnle is created, and the sending part can be retrieved by calling
-// GetSender().
-//
-// It also provides a Receive() function to simulate the on-transaction
-// callback of a real Android binder.
-class FakeTransactionReceiver : public TransactionReceiver {
- public:
-  FakeTransactionReceiver(grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-                          TransactionReceiver::OnTransactCb cb);
-
-  void* GetRawBinder() override;
-
-  std::unique_ptr<Binder> GetSender() const;
-
- private:
-  PersistentFakeTransactionReceiver* persistent_tx_receiver_;
-};
-
-// A "persistent" version of the FakeTransactionReceiver. That is, its lifetime
-// is managed by the processor and it outlives the wire reader and
-// grpc_binder_transport, so we can safely dereference a pointer to it in
-// ProcessLoop().
-class PersistentFakeTransactionReceiver {
- public:
-  PersistentFakeTransactionReceiver(
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      TransactionReceiver::OnTransactCb cb,
-      std::unique_ptr<FakeBinderTunnel> tunnel);
-
-  absl::Status Receive(BinderTransportTxCode tx_code, ReadableParcel* parcel) {
-    return callback_(static_cast<transaction_code_t>(tx_code), parcel,
-                     /*uid=*/0);
-  }
-
- private:
-  grpc_core::RefCountedPtr<WireReader> wire_reader_ref_;
-  TransactionReceiver::OnTransactCb callback_;
-  std::unique_ptr<FakeBinderTunnel> tunnel_;
-
-  friend class FakeTransactionReceiver;
-};
-
-// The sending part of a binders pair. It provides a FakeWritableParcel to the
-// user, and when Transact() is called, it transfers the written data to the
-// other end of the tunnel by following the information in its endpoint.
-class FakeBinder final : public Binder {
- public:
-  explicit FakeBinder(FakeEndpoint* endpoint) : endpoint_(endpoint) {}
-
-  void Initialize() override {}
-  absl::Status PrepareTransaction() override {
-    input_ = std::make_unique<FakeWritableParcel>();
-    return absl::OkStatus();
-  }
-
-  absl::Status Transact(BinderTransportTxCode tx_code) override;
-
-  WritableParcel* GetWritableParcel() const override { return input_.get(); }
-
-  std::unique_ptr<TransactionReceiver> ConstructTxReceiver(
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      TransactionReceiver::OnTransactCb transact_cb) const override;
-
-  void* GetRawBinder() override { return endpoint_->other_end; }
-
- private:
-  FakeEndpoint* endpoint_;
-  std::unique_ptr<FakeWritableParcel> input_;
-};
-
-// A transaction processor.
-//
-// Once constructed, it'll create a another thread that deliver in-coming
-// transactions to their destinations.
-class TransactionProcessor {
- public:
-  explicit TransactionProcessor(absl::Duration delay = absl::ZeroDuration());
-  ~TransactionProcessor() { Terminate(); }
-
-  void SetDelay(absl::Duration delay);
-
-  void Terminate();
-  void ProcessLoop();
-  void Flush();
-
-  // Issue a transaction with |target| pointing to the target endpoint. The
-  // transactions will be delivered in the same order they're issued, possibly
-  // with random delay to simulate real-world situation.
-  void EnQueueTransaction(FakeEndpoint* target, BinderTransportTxCode tx_code,
-                          FakeData data);
-
-  PersistentFakeTransactionReceiver& NewPersistentTxReceiver(
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      TransactionReceiver::OnTransactCb cb,
-      std::unique_ptr<FakeBinderTunnel> tunnel) {
-    grpc_core::MutexLock lock(&tx_receiver_mu_);
-    storage_.emplace_front(wire_reader_ref, cb, std::move(tunnel));
-    return storage_.front();
-  }
-
- private:
-  absl::Duration GetRandomDelay();
-  void WaitForNextTransaction() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_);
-
-  grpc_core::Mutex mu_;
-  std::queue<std::tuple<FakeEndpoint*, BinderTransportTxCode, FakeData>>
-      tx_queue_ ABSL_GUARDED_BY(mu_);
-  absl::Time deliver_time_ ABSL_GUARDED_BY(mu_);
-  int64_t delay_nsec_;
-  absl::BitGen bit_gen_;
-  grpc_core::Thread tx_thread_;
-  std::atomic<bool> terminated_;
-
-  grpc_core::Mutex tx_receiver_mu_;
-  // Use forward_list to avoid invalid pointers resulted by reallocation in
-  // containers such as std::vector.
-  std::forward_list<PersistentFakeTransactionReceiver> storage_
-      ABSL_GUARDED_BY(tx_receiver_mu_);
-};
-
-// The global (shared) processor. Test suite should be responsible of
-// creating/deleting it.
-extern TransactionProcessor* g_transaction_processor;
-
-// A binder tunnel.
-//
-// It is a simple helper that creates and links two endpoints.
-class FakeBinderTunnel {
- public:
-  FakeBinderTunnel();
-
-  void EnQueueTransaction(FakeEndpoint* target, BinderTransportTxCode tx_code,
-                          FakeData data) {
-    g_transaction_processor->EnQueueTransaction(target, tx_code,
-                                                std::move(data));
-  }
-
-  FakeEndpoint* GetSendEndpoint() const { return send_endpoint_.get(); }
-  FakeEndpoint* GetRecvEndpoint() const { return recv_endpoint_.get(); }
-
- private:
-  std::unique_ptr<FakeEndpoint> send_endpoint_;
-  std::unique_ptr<FakeEndpoint> recv_endpoint_;
-};
-
-// A helper function for constructing a pair of connected binders.
-std::pair<std::unique_ptr<Binder>, std::unique_ptr<TransactionReceiver>>
-NewBinderPair(TransactionReceiver::OnTransactCb transact_cb);
-
-}  // namespace end2end_testing
-}  // namespace grpc_binder
-
-#endif  // GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_FAKE_BINDER_H
diff --git a/test/core/transport/binder/end2end/fake_binder_test.cc b/test/core/transport/binder/end2end/fake_binder_test.cc
deleted file mode 100644
index 68875bcd864..00000000000
--- a/test/core/transport/binder/end2end/fake_binder_test.cc
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "test/core/transport/binder/end2end/fake_binder.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <algorithm>
-#include <random>
-#include <string>
-#include <utility>
-
-#include "absl/strings/str_format.h"
-#include "absl/time/time.h"
-#include "test/core/test_util/test_config.h"
-
-namespace grpc_binder {
-namespace end2end_testing {
-namespace {
-
-class FakeBinderTest : public ::testing::TestWithParam<absl::Duration> {
- public:
-  FakeBinderTest() {
-    g_transaction_processor = new TransactionProcessor(GetParam());
-  }
-  ~FakeBinderTest() override { delete g_transaction_processor; }
-};
-
-}  // namespace
-
-TEST_P(FakeBinderTest, SendInt32) {
-  constexpr int kValue = 0x1234;
-  constexpr int kTxCode = 0x4321;
-  int called = 0;
-  std::unique_ptr<Binder> sender;
-  std::unique_ptr<TransactionReceiver> tx_receiver;
-  std::tie(sender, tx_receiver) = NewBinderPair(
-      [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) {
-        EXPECT_EQ(tx_code, kTxCode);
-        int value = 0;
-        EXPECT_TRUE(parcel->ReadInt32(&value).ok());
-        EXPECT_EQ(value, kValue);
-        called++;
-        return absl::OkStatus();
-      });
-
-  EXPECT_TRUE(sender->PrepareTransaction().ok());
-  WritableParcel* parcel = sender->GetWritableParcel();
-  EXPECT_TRUE(parcel->WriteInt32(kValue).ok());
-  EXPECT_TRUE(sender->Transact(BinderTransportTxCode(kTxCode)).ok());
-
-  g_transaction_processor->Terminate();
-  EXPECT_EQ(called, 1);
-}
-
-TEST_P(FakeBinderTest, SendString) {
-  constexpr char kValue[] = "example-string";
-  constexpr int kTxCode = 0x4321;
-  int called = 0;
-  std::unique_ptr<Binder> sender;
-  std::unique_ptr<TransactionReceiver> tx_receiver;
-  std::tie(sender, tx_receiver) = NewBinderPair(
-      [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) {
-        EXPECT_EQ(tx_code, kTxCode);
-        std::string value;
-        EXPECT_TRUE(parcel->ReadString(&value).ok());
-        EXPECT_STREQ(value.c_str(), kValue);
-        called++;
-        return absl::OkStatus();
-      });
-
-  EXPECT_TRUE(sender->PrepareTransaction().ok());
-  WritableParcel* parcel = sender->GetWritableParcel();
-  EXPECT_TRUE(parcel->WriteString(kValue).ok());
-  EXPECT_TRUE(sender->Transact(BinderTransportTxCode(kTxCode)).ok());
-
-  g_transaction_processor->Terminate();
-  EXPECT_EQ(called, 1);
-}
-
-TEST_P(FakeBinderTest, SendByteArray) {
-  constexpr char kValue[] = "example-byte-array";
-  constexpr int kTxCode = 0x4321;
-  int called = 0;
-  std::unique_ptr<Binder> sender;
-  std::unique_ptr<TransactionReceiver> tx_receiver;
-  std::tie(sender, tx_receiver) = NewBinderPair(
-      [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) {
-        EXPECT_EQ(tx_code, kTxCode);
-        std::string value;
-        EXPECT_TRUE(parcel->ReadByteArray(&value).ok());
-        EXPECT_EQ(value, kValue);
-        called++;
-        return absl::OkStatus();
-      });
-
-  EXPECT_TRUE(sender->PrepareTransaction().ok());
-  WritableParcel* parcel = sender->GetWritableParcel();
-  EXPECT_TRUE(parcel
-                  ->WriteByteArray(reinterpret_cast<const int8_t*>(kValue),
-                                   strlen(kValue))
-                  .ok());
-  EXPECT_TRUE(sender->Transact(BinderTransportTxCode(kTxCode)).ok());
-
-  g_transaction_processor->Terminate();
-  EXPECT_EQ(called, 1);
-}
-
-TEST_P(FakeBinderTest, SendMultipleItems) {
-  constexpr char kByteArray[] = "example-byte-array";
-  constexpr char kString[] = "example-string";
-  constexpr int kValue = 0x1234;
-  constexpr int kTxCode = 0x4321;
-  int called = 0;
-  std::unique_ptr<Binder> sender;
-  std::unique_ptr<TransactionReceiver> tx_receiver;
-  std::tie(sender, tx_receiver) = NewBinderPair(
-      [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) {
-        int value_result;
-        EXPECT_EQ(tx_code, kTxCode);
-        EXPECT_TRUE(parcel->ReadInt32(&value_result).ok());
-        EXPECT_EQ(value_result, kValue);
-        std::string byte_array_result;
-        EXPECT_TRUE(parcel->ReadByteArray(&byte_array_result).ok());
-        EXPECT_EQ(byte_array_result, kByteArray);
-        std::string string_result;
-        EXPECT_TRUE(parcel->ReadString(&string_result).ok());
-        EXPECT_STREQ(string_result.c_str(), kString);
-        called++;
-        return absl::OkStatus();
-      });
-
-  EXPECT_TRUE(sender->PrepareTransaction().ok());
-  WritableParcel* parcel = sender->GetWritableParcel();
-  EXPECT_TRUE(parcel->WriteInt32(kValue).ok());
-  EXPECT_TRUE(parcel
-                  ->WriteByteArray(reinterpret_cast<const int8_t*>(kByteArray),
-                                   strlen(kByteArray))
-                  .ok());
-  EXPECT_TRUE(parcel->WriteString(kString).ok());
-  EXPECT_TRUE(sender->Transact(BinderTransportTxCode(kTxCode)).ok());
-
-  g_transaction_processor->Terminate();
-  EXPECT_EQ(called, 1);
-}
-
-TEST_P(FakeBinderTest, SendBinder) {
-  constexpr int kValue = 0x1234;
-  constexpr int kTxCode = 0x4321;
-  int called = 0;
-  std::unique_ptr<Binder> sender;
-  std::unique_ptr<TransactionReceiver> tx_receiver;
-  std::tie(sender, tx_receiver) = NewBinderPair(
-      [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) {
-        EXPECT_EQ(tx_code, kTxCode);
-        std::unique_ptr<Binder> binder;
-        EXPECT_TRUE(parcel->ReadBinder(&binder).ok());
-        EXPECT_TRUE(binder->PrepareTransaction().ok());
-        WritableParcel* writable_parcel = binder->GetWritableParcel();
-        EXPECT_TRUE(writable_parcel->WriteInt32(kValue).ok());
-        EXPECT_TRUE(binder->Transact(BinderTransportTxCode(kTxCode + 1)).ok());
-        called++;
-        return absl::OkStatus();
-      });
-
-  int called2 = 0;
-  std::unique_ptr<TransactionReceiver> tx_receiver2 =
-      std::make_unique<FakeTransactionReceiver>(
-          nullptr,
-          [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) {
-            int value;
-            EXPECT_TRUE(parcel->ReadInt32(&value).ok());
-            EXPECT_EQ(value, kValue);
-            EXPECT_EQ(tx_code, kTxCode + 1);
-            called2++;
-            return absl::OkStatus();
-          });
-  EXPECT_TRUE(sender->PrepareTransaction().ok());
-  WritableParcel* parcel = sender->GetWritableParcel();
-  EXPECT_TRUE(parcel->WriteBinder(tx_receiver2.get()).ok());
-  EXPECT_TRUE(sender->Transact(BinderTransportTxCode(kTxCode)).ok());
-
-  g_transaction_processor->Terminate();
-  EXPECT_EQ(called, 1);
-  EXPECT_EQ(called2, 1);
-}
-
-TEST_P(FakeBinderTest, SendTransactionAfterDestruction) {
-  constexpr int kValue = 0x1234;
-  constexpr int kTxCode = 0x4321;
-  std::unique_ptr<Binder> sender;
-  int called = 0;
-  {
-    std::unique_ptr<TransactionReceiver> tx_receiver;
-    std::tie(sender, tx_receiver) = NewBinderPair(
-        [&](transaction_code_t tx_code, ReadableParcel* parcel, int /*uid*/) {
-          EXPECT_EQ(tx_code, kTxCode);
-          int value;
-          EXPECT_TRUE(parcel->ReadInt32(&value).ok());
-          EXPECT_EQ(value, kValue + called);
-          called++;
-          return absl::OkStatus();
-        });
-    EXPECT_TRUE(sender->PrepareTransaction().ok());
-    WritableParcel* parcel = sender->GetWritableParcel();
-    EXPECT_TRUE(parcel->WriteInt32(kValue).ok());
-    EXPECT_TRUE(sender->Transact(BinderTransportTxCode(kTxCode)).ok());
-  }
-  // tx_receiver gets destructed here. This additional transaction should
-  // *still* be received.
-  EXPECT_TRUE(sender->PrepareTransaction().ok());
-  WritableParcel* parcel = sender->GetWritableParcel();
-  EXPECT_TRUE(parcel->WriteInt32(kValue + 1).ok());
-  EXPECT_TRUE(sender->Transact(BinderTransportTxCode(kTxCode)).ok());
-
-  g_transaction_processor->Terminate();
-  EXPECT_EQ(called, 2);
-}
-
-namespace {
-
-struct ThreadArgument {
-  int tid;
-  std::vector<std::vector<std::pair<std::unique_ptr<Binder>,
-                                    std::unique_ptr<TransactionReceiver>>>>*
-      global_binder_pairs;
-  std::vector<std::vector<int>>* global_cnts;
-  int tx_code;
-  int num_pairs_per_thread;
-  int num_transactions_per_pair;
-  grpc_core::Mutex* mu;
-};
-
-}  // namespace
-
-// Verify that this system works correctly in a concurrent environment.
-//
-// In end-to-end tests, there will be at least two threads, one from client to
-// server and vice versa. Thus, it's important for us to make sure that the
-// simulation is correct in such setup.
-TEST_P(FakeBinderTest, StressTest) {
-  constexpr int kTxCode = 0x4321;
-  constexpr int kNumThreads = 16;
-  constexpr int kNumPairsPerThread = 128;
-  constexpr int kNumTransactionsPerPair = 128;
-  std::vector<ThreadArgument> args(kNumThreads);
-
-  grpc_core::Mutex mu;
-  std::vector<std::vector<
-      std::pair<std::unique_ptr<Binder>, std::unique_ptr<TransactionReceiver>>>>
-      global_binder_pairs(kNumThreads);
-  std::vector<std::vector<int>> global_cnts(
-      kNumThreads, std::vector<int>(kNumPairsPerThread, 0));
-
-  auto th_function = [](void* arg) {
-    ThreadArgument* th_arg = static_cast<ThreadArgument*>(arg);
-    int tid = th_arg->tid;
-    std::vector<std::pair<std::unique_ptr<Binder>,
-                          std::unique_ptr<TransactionReceiver>>>
-        binder_pairs;
-    for (int p = 0; p < th_arg->num_pairs_per_thread; ++p) {
-      std::unique_ptr<Binder> binder;
-      std::unique_ptr<TransactionReceiver> tx_receiver;
-      int expected_tx_code = th_arg->tx_code;
-      std::vector<std::vector<int>>* cnt = th_arg->global_cnts;
-      std::tie(binder, tx_receiver) =
-          NewBinderPair([tid, p, cnt, expected_tx_code](
-                            transaction_code_t tx_code, ReadableParcel* parcel,
-                            int /*uid*/) mutable {
-            EXPECT_EQ(tx_code, expected_tx_code);
-            int value;
-            EXPECT_TRUE(parcel->ReadInt32(&value).ok());
-            EXPECT_EQ(tid, value);
-            EXPECT_TRUE(parcel->ReadInt32(&value).ok());
-            EXPECT_EQ(p, value);
-            EXPECT_TRUE(parcel->ReadInt32(&value).ok());
-            EXPECT_EQ((*cnt)[tid][p], value);
-            (*cnt)[tid][p]++;
-            return absl::OkStatus();
-          });
-      binder_pairs.emplace_back(std::move(binder), std::move(tx_receiver));
-    }
-    std::vector<int> order;
-    for (int i = 0; i < th_arg->num_pairs_per_thread; ++i) {
-      for (int j = 0; j < th_arg->num_transactions_per_pair; ++j) {
-        order.emplace_back(i);
-      }
-    }
-    std::mt19937 rng(tid);
-    std::shuffle(order.begin(), order.end(), rng);
-    std::vector<int> tx_cnt(th_arg->num_pairs_per_thread);
-    for (int p : order) {
-      EXPECT_TRUE(binder_pairs[p].first->PrepareTransaction().ok());
-      WritableParcel* parcel = binder_pairs[p].first->GetWritableParcel();
-      EXPECT_TRUE(parcel->WriteInt32(th_arg->tid).ok());
-      EXPECT_TRUE(parcel->WriteInt32(p).ok());
-      EXPECT_TRUE(parcel->WriteInt32(tx_cnt[p]++).ok());
-      EXPECT_TRUE(binder_pairs[p]
-                      .first->Transact(BinderTransportTxCode(th_arg->tx_code))
-                      .ok());
-    }
-    th_arg->mu->Lock();
-    (*th_arg->global_binder_pairs)[tid] = std::move(binder_pairs);
-    th_arg->mu->Unlock();
-  };
-
-  std::vector<grpc_core::Thread> thrs(kNumThreads);
-  std::vector<std::string> thr_names(kNumThreads);
-  for (int i = 0; i < kNumThreads; ++i) {
-    args[i].tid = i;
-    args[i].global_binder_pairs = &global_binder_pairs;
-    args[i].global_cnts = &global_cnts;
-    args[i].tx_code = kTxCode;
-    args[i].num_pairs_per_thread = kNumPairsPerThread;
-    args[i].num_transactions_per_pair = kNumTransactionsPerPair;
-    args[i].mu = &mu;
-    thr_names[i] = absl::StrFormat("thread-%d", i);
-    thrs[i] = grpc_core::Thread(thr_names[i].c_str(), th_function, &args[i]);
-  }
-  for (auto& th : thrs) th.Start();
-  for (auto& th : thrs) th.Join();
-  g_transaction_processor->Terminate();
-}
-
-INSTANTIATE_TEST_SUITE_P(FakeBinderTestWithDifferentDelayTimes, FakeBinderTest,
-                         testing::Values(absl::ZeroDuration(),
-                                         absl::Nanoseconds(10),
-                                         absl::Microseconds(10)));
-
-}  // namespace end2end_testing
-}  // namespace grpc_binder
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/binder/end2end/fuzzers/BUILD b/test/core/transport/binder/end2end/fuzzers/BUILD
deleted file mode 100644
index a0184afd3cb..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/BUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_package", "grpc_proto_library")
-load("//test/core/test_util:grpc_fuzzer.bzl", "grpc_proto_fuzzer")
-
-grpc_package(
-    name = "test/core/transport/binder/end2end/fuzzers",
-    features = [
-        "layering_check",
-    ],
-)
-
-licenses(["notice"])
-
-# Protobuf messages for generating inputs. We manually define proto
-# library rule here so the same proto file can be shared between multiple
-# grpc_proto_fuzzer targets
-grpc_proto_library(
-    name = "binder_transport_fuzzer_proto",
-    srcs = ["binder_transport_fuzzer.proto"],
-)
-
-grpc_cc_library(
-    name = "fuzzer_utils",
-    srcs = ["fuzzer_utils.cc"],
-    external_deps = [
-        "absl/log:check",
-        "absl/log:log",
-    ],
-    language = "c++",
-    public_hdrs = ["fuzzer_utils.h"],
-    deps = [
-        "binder_transport_fuzzer_proto",
-        "//:gpr",
-        "//:grpc++",
-        "//:grpc++_base",
-        "//:grpc_base",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_proto_fuzzer(
-    name = "binder_transport_client_fuzzer",
-    srcs = [
-        "client_fuzzer.cc",
-    ],
-    corpus = "binder_transport_client_fuzzer_corpus",
-    external_deps = ["absl/log:check"],
-    owner = "binder",
-    proto = "client.proto",
-    tags = [
-        "no_mac",
-        "no_windows",
-    ],
-    deps = [
-        "binder_transport_fuzzer_proto",
-        ":fuzzer_utils",
-        "//:gpr",
-        "//:grpc++",
-        "//:grpc++_base",
-        "//:grpc_base",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
-
-grpc_proto_fuzzer(
-    name = "binder_transport_server_fuzzer",
-    srcs = [
-        "server_fuzzer.cc",
-    ],
-    corpus = "binder_transport_server_fuzzer_corpus",
-    external_deps = ["absl/log:check"],
-    owner = "binder",
-    proto = "server.proto",
-    tags = [
-        "no_mac",
-        "no_windows",
-    ],
-    deps = [
-        "binder_transport_fuzzer_proto",
-        ":fuzzer_utils",
-        "//:gpr",
-        "//:grpc++",
-        "//:grpc++_base",
-        "//:grpc_base",
-        "//src/core:slice",
-        "//test/core/test_util:grpc_test_util",
-    ],
-)
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty b/test/core/transport/binder/end2end/fuzzers/binder_transport_client_fuzzer_corpus/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto b/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
deleted file mode 100644
index 8fb2aa3edd1..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.proto
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package binder_transport_fuzzer;
-
-message Binder {}
-
-message Value {
-  oneof data_type {
-    int32 i32 = 1;
-    int64 i64 = 2;
-    bytes byte_array = 3;
-    // Strings in Parcel could also contain non UTF-8 data so we use bytes
-    // to represent string here
-    bytes str = 4;
-    Binder binder = 5;
-  }
-}
-
-message Parcel {
-  repeated Value values = 1;
-
-  // Simulates the return value of AParcel_getDataSize
-  // (The value generated by protobuf libprotobuf-mutator might not always make sense
-  // but the transport implementation should handle that)
-  int32 data_size = 2;
-}
-
-enum TransactionCode {
-  INVALID = 0;
-  SETUP_TRANSPORT = 1;
-  SHUTDOWN_TRANSPORT = 2;
-  ACKNOWLEDGE_BYTES = 3;
-  PING = 4;
-  PING_RESPONSE = 5;
-}
-
-message Transaction {
-  TransactionCode code = 1;
-  int32 uid = 2;
-  Parcel parcel = 3;
-}
-
-// Special parcel that used for setting up transport.
-// TODO(mingcl): Consider also fuzzing the setup transport code path
-message SetupTransportParcel {
-  int32 version = 1;
-
-  // Simulates the return value of AParcel_getDataSize
-  // (The value generated by protobuf libprotobuf-mutator might not always make sense
-  // but the transport implementation should handle that)
-  int32 data_size = 2;
-}
-
-message SetupTransportTransaction {
-  int32 uid = 1;
-  SetupTransportParcel parcel = 2;
-}
-
-message IncomingParcels {
-  SetupTransportTransaction setup_transport_transaction = 1;
-  repeated Transaction transactions = 2;
-}
-
-message Input {
-  IncomingParcels incoming_parcels = 1;
-}
-
diff --git a/test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty b/test/core/transport/binder/end2end/fuzzers/binder_transport_server_fuzzer_corpus/empty
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/test/core/transport/binder/end2end/fuzzers/client.proto b/test/core/transport/binder/end2end/fuzzers/client.proto
deleted file mode 100644
index 4fe133a7d24..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/client.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package binder_transport_fuzzer;
diff --git a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
deleted file mode 100644
index e852b032fcb..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/client_fuzzer.cc
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-
-#include <thread>
-#include <utility>
-
-#include "absl/log/check.h"
-#include "absl/memory/memory.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/iomgr/executor.h"
-#include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/channel_create.h"
-#include "src/libfuzzer/libfuzzer_macro.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h"
-#include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h"
-
-bool squelch = true;
-bool leak_check = true;
-
-static void* tag(intptr_t t) { return reinterpret_cast<void*>(t); }
-
-DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) {
-  if (squelch) {
-    grpc_disable_all_absl_logs();
-  }
-  grpc_init();
-  {
-    // Copied and modified from grpc/test/core/end2end/fuzzers/client_fuzzer.cc
-    grpc_core::ExecCtx exec_ctx;
-    grpc_core::Executor::SetThreadingAll(false);
-
-    grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr);
-    grpc_core::Transport* client_transport =
-        grpc_create_binder_transport_client(
-            std::make_unique<grpc_binder::fuzzing::BinderForFuzzing>(
-                input.incoming_parcels()),
-            std::make_shared<
-                grpc::experimental::binder::UntrustedSecurityPolicy>());
-    grpc_arg authority_arg = grpc_channel_arg_string_create(
-        const_cast<char*>(GRPC_ARG_DEFAULT_AUTHORITY),
-        const_cast<char*>("test-authority"));
-    grpc_channel_args* args =
-        grpc_channel_args_copy_and_add(nullptr, &authority_arg, 1);
-    auto channel_args = grpc_core::CoreConfiguration::Get()
-                            .channel_args_preconditioning()
-                            .PreconditionChannelArgs(args);
-    auto channel =
-        grpc_core::ChannelCreate("test-target", channel_args,
-                                 GRPC_CLIENT_DIRECT_CHANNEL, client_transport)
-            ->release()
-            ->c_ptr();
-    grpc_channel_args_destroy(args);
-    grpc_slice host = grpc_slice_from_static_string("localhost");
-    grpc_call* call = grpc_channel_create_call(
-        channel, nullptr, 0, cq, grpc_slice_from_static_string("/foo"), &host,
-        gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
-    grpc_metadata_array initial_metadata_recv;
-    grpc_metadata_array_init(&initial_metadata_recv);
-    grpc_byte_buffer* response_payload_recv = nullptr;
-    grpc_metadata_array trailing_metadata_recv;
-    grpc_metadata_array_init(&trailing_metadata_recv);
-    grpc_status_code status;
-    grpc_slice details = grpc_empty_slice();
-
-    grpc_op ops[6];
-    memset(ops, 0, sizeof(ops));
-    grpc_op* op = ops;
-    op->op = GRPC_OP_SEND_INITIAL_METADATA;
-    op->data.send_initial_metadata.count = 0;
-    op->flags = 0;
-    op->reserved = nullptr;
-    op++;
-    op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
-    op->flags = 0;
-    op->reserved = nullptr;
-    op++;
-    op->op = GRPC_OP_RECV_INITIAL_METADATA;
-    op->data.recv_initial_metadata.recv_initial_metadata =
-        &initial_metadata_recv;
-    op->flags = 0;
-    op->reserved = nullptr;
-    op++;
-    op->op = GRPC_OP_RECV_MESSAGE;
-    op->data.recv_message.recv_message = &response_payload_recv;
-    op->flags = 0;
-    op->reserved = nullptr;
-    op++;
-    op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
-    op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
-    op->data.recv_status_on_client.status = &status;
-    op->data.recv_status_on_client.status_details = &details;
-    op->flags = 0;
-    op->reserved = nullptr;
-    op++;
-    grpc_call_error error = grpc_call_start_batch(
-        call, ops, static_cast<size_t>(op - ops), tag(1), nullptr);
-    int requested_calls = 1;
-    CHECK_EQ(error, GRPC_CALL_OK);
-    grpc_event ev;
-    while (true) {
-      grpc_core::ExecCtx::Get()->Flush();
-      ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME),
-                                      nullptr);
-      switch (ev.type) {
-        case GRPC_QUEUE_TIMEOUT:
-          goto done;
-        case GRPC_QUEUE_SHUTDOWN:
-          break;
-        case GRPC_OP_COMPLETE:
-          requested_calls--;
-          break;
-      }
-    }
-
-  done:
-    if (requested_calls) {
-      grpc_call_cancel(call, nullptr);
-    }
-    grpc_binder::fuzzing::JoinFuzzingThread();
-    for (int i = 0; i < requested_calls; i++) {
-      ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME),
-                                      nullptr);
-      CHECK(ev.type == GRPC_OP_COMPLETE);
-    }
-    grpc_completion_queue_shutdown(cq);
-    for (int i = 0; i < requested_calls; i++) {
-      ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME),
-                                      nullptr);
-      CHECK(ev.type == GRPC_QUEUE_SHUTDOWN);
-    }
-    grpc_call_unref(call);
-    grpc_completion_queue_destroy(cq);
-    grpc_metadata_array_destroy(&initial_metadata_recv);
-    grpc_metadata_array_destroy(&trailing_metadata_recv);
-    grpc_slice_unref(details);
-    grpc_channel_destroy(channel);
-    if (response_payload_recv != nullptr) {
-      grpc_byte_buffer_destroy(response_payload_recv);
-    }
-  }
-  grpc_shutdown();
-}
diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
deleted file mode 100644
index 11609ac92f8..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.cc
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h"
-
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-
-namespace grpc_binder {
-namespace fuzzing {
-
-namespace {
-
-std::thread* g_fuzzing_thread = nullptr;
-
-template <typename... Args>
-void CreateFuzzingThread(Args&&... args) {
-  CHECK_EQ(g_fuzzing_thread, nullptr);
-  g_fuzzing_thread = new std::thread(std::forward<Args>(args)...);
-}
-
-}  // namespace
-
-void JoinFuzzingThread() {
-  if (g_fuzzing_thread) {
-    g_fuzzing_thread->join();
-    delete g_fuzzing_thread;
-    g_fuzzing_thread = nullptr;
-  }
-}
-
-int32_t ReadableParcelForFuzzing::GetDataSize() const {
-  return parcel_data_size_;
-}
-
-absl::Status ReadableParcelForFuzzing::ReadInt32(int32_t* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_i32()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().i32();
-  values_.pop();
-  consumed_data_size_ += sizeof(int32_t);
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadInt64(int64_t* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_i64()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().i64();
-  values_.pop();
-  consumed_data_size_ += sizeof(int64_t);
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadBinder(
-    std::unique_ptr<Binder>* binder) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_binder()) {
-    return absl::InternalError("error");
-  }
-  *binder = std::make_unique<BinderForFuzzing>();
-  values_.pop();
-  consumed_data_size_ += sizeof(void*);
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadByteArray(std::string* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_byte_array()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().byte_array();
-  values_.pop();
-  consumed_data_size_ += data->size();
-  return absl::OkStatus();
-}
-
-absl::Status ReadableParcelForFuzzing::ReadString(std::string* data) {
-  if (consumed_data_size_ >= kParcelDataSizeLimit) {
-    return absl::InternalError("Parcel size limit exceeds");
-  }
-  if (values_.empty() || !values_.front().has_str()) {
-    return absl::InternalError("error");
-  }
-  *data = values_.front().str();
-  values_.pop();
-  consumed_data_size_ += data->size();
-  return absl::OkStatus();
-}
-
-void FuzzingLoop(
-    binder_transport_fuzzer::IncomingParcels incoming_parcels,
-    grpc_core::RefCountedPtr<grpc_binder::WireReader> wire_reader_ref,
-    grpc_binder::TransactionReceiver::OnTransactCb callback) {
-  {
-    // Send SETUP_TRANSPORT request.
-    std::unique_ptr<grpc_binder::ReadableParcel> parcel =
-        std::make_unique<ReadableParcelForFuzzing>(
-            incoming_parcels.setup_transport_transaction().parcel());
-    callback(static_cast<transaction_code_t>(
-                 grpc_binder::BinderTransportTxCode::SETUP_TRANSPORT),
-             parcel.get(),
-             /*uid=*/incoming_parcels.setup_transport_transaction().uid())
-        .IgnoreError();
-  }
-  for (const auto& tx_iter : incoming_parcels.transactions()) {
-    transaction_code_t tx_code = tx_iter.code();
-    std::unique_ptr<grpc_binder::ReadableParcel> parcel =
-        std::make_unique<ReadableParcelForFuzzing>(tx_iter.parcel());
-    callback(tx_code, parcel.get(),
-             /*uid=*/tx_iter.uid())
-        .IgnoreError();
-  }
-  wire_reader_ref = nullptr;
-}
-
-TransactionReceiverForFuzzing::TransactionReceiverForFuzzing(
-    binder_transport_fuzzer::IncomingParcels incoming_parcels,
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb cb) {
-  LOG(INFO) << "Construct TransactionReceiverForFuzzing";
-  CreateFuzzingThread(FuzzingLoop, std::move(incoming_parcels),
-                      std::move(wire_reader_ref), std::move(cb));
-}
-
-std::unique_ptr<TransactionReceiver> BinderForFuzzing::ConstructTxReceiver(
-    grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-    TransactionReceiver::OnTransactCb cb) const {
-  auto tx_receiver = std::make_unique<TransactionReceiverForFuzzing>(
-      incoming_parcels_, wire_reader_ref, cb);
-  return tx_receiver;
-}
-
-}  // namespace fuzzing
-}  // namespace grpc_binder
diff --git a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h b/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
deleted file mode 100644
index ee47780b227..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_FUZZERS_FUZZER_UTILS_H
-#define GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_FUZZERS_FUZZER_UTILS_H
-
-#include <memory>
-#include <queue>
-#include <string>
-#include <thread>
-#include <vector>
-
-#include "absl/memory/memory.h"
-#include "absl/status/status.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-#include "src/core/util/crash.h"
-#include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h"
-
-namespace grpc_binder {
-namespace fuzzing {
-
-// A WritableParcel implementation that simply does nothing. Don't use
-// MockWritableParcel here since capturing calls is expensive.
-class NoOpWritableParcel : public WritableParcel {
- public:
-  int32_t GetDataSize() const override { return 0; }
-  absl::Status WriteInt32(int32_t /*data*/) override {
-    return absl::OkStatus();
-  }
-  absl::Status WriteInt64(int64_t /*data*/) override {
-    return absl::OkStatus();
-  }
-  absl::Status WriteBinder(HasRawBinder* /*binder*/) override {
-    return absl::OkStatus();
-  }
-  absl::Status WriteString(absl::string_view /*s*/) override {
-    return absl::OkStatus();
-  }
-  absl::Status WriteByteArray(const int8_t* /*buffer*/,
-                              int32_t /*length*/) override {
-    return absl::OkStatus();
-  }
-};
-
-// Binder implementation used in fuzzing.
-//
-// Most of its the functionalities are no-op, except ConstructTxReceiver now
-// returns a TransactionReceiverForFuzzing.
-class BinderForFuzzing : public Binder {
- public:
-  BinderForFuzzing() : input_(std::make_unique<NoOpWritableParcel>()) {}
-
-  explicit BinderForFuzzing(const binder_transport_fuzzer::IncomingParcels& p)
-      : incoming_parcels_(p), input_(std::make_unique<NoOpWritableParcel>()) {}
-
-  void Initialize() override {}
-  absl::Status PrepareTransaction() override { return absl::OkStatus(); }
-
-  absl::Status Transact(BinderTransportTxCode /*tx_code*/) override {
-    return absl::OkStatus();
-  }
-
-  std::unique_ptr<TransactionReceiver> ConstructTxReceiver(
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      TransactionReceiver::OnTransactCb cb) const override;
-
-  WritableParcel* GetWritableParcel() const override { return input_.get(); }
-  void* GetRawBinder() override { return nullptr; }
-
- private:
-  binder_transport_fuzzer::IncomingParcels incoming_parcels_;
-  std::unique_ptr<WritableParcel> input_;
-};
-
-// ReadableParcel implementation used in fuzzing.
-//
-// It consumes a Parcel generated by mutator, and returns the data in the Parcel
-// upon user's requests.
-class ReadableParcelForFuzzing : public ReadableParcel {
- public:
-  explicit ReadableParcelForFuzzing(const binder_transport_fuzzer::Parcel& p)
-      : parcel_data_size_(p.data_size()), consumed_data_size_(0) {
-    for (const auto& v : p.values()) {
-      values_.push(v);
-    }
-  }
-
-  // Construct from SetupTransportParcel, which have fixed types of data in it.
-  explicit ReadableParcelForFuzzing(
-      const binder_transport_fuzzer::SetupTransportParcel& p)
-      : parcel_data_size_(p.data_size()), consumed_data_size_(0) {
-    // Creates value for protocol version and put it into the queue
-    binder_transport_fuzzer::Value version_value;
-    version_value.set_i32(p.version());
-    values_.push(version_value);
-
-    // Creates a binder value and put it into the queue
-    binder_transport_fuzzer::Value binder_value;
-    binder_value.mutable_binder();  // sets one-of field
-    values_.push(binder_value);
-  }
-
-  int32_t GetDataSize() const override;
-  absl::Status ReadInt32(int32_t* data) override;
-  absl::Status ReadInt64(int64_t* data) override;
-  absl::Status ReadBinder(std::unique_ptr<Binder>* binder) override;
-  absl::Status ReadByteArray(std::string* data) override;
-  absl::Status ReadString(std::string* data) override;
-
- private:
-  // Stores data/objects in binder in their order. Since we don't support random
-  // access using a std::queue is enough here.
-  std::queue<binder_transport_fuzzer::Value> values_;
-
-  const int32_t parcel_data_size_;
-
-  static constexpr size_t kParcelDataSizeLimit = 1024 * 1024;
-  size_t consumed_data_size_;
-};
-
-void JoinFuzzingThread();
-
-// TransactionReceiver implementation used in fuzzing.
-//
-// When constructed, start sending fuzzed requests to the client. When all the
-// bytes are consumed, the reference to WireReader will be released.
-class TransactionReceiverForFuzzing : public TransactionReceiver {
- public:
-  TransactionReceiverForFuzzing(
-      binder_transport_fuzzer::IncomingParcels incoming_parcels,
-      grpc_core::RefCountedPtr<WireReader> wire_reader_ref,
-      TransactionReceiver::OnTransactCb cb);
-
-  void* GetRawBinder() override { return nullptr; }
-};
-
-}  // namespace fuzzing
-}  // namespace grpc_binder
-
-#endif  // GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_FUZZERS_FUZZER_UTILS_H
diff --git a/test/core/transport/binder/end2end/fuzzers/server.proto b/test/core/transport/binder/end2end/fuzzers/server.proto
deleted file mode 100644
index 4fe133a7d24..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/server.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package binder_transport_fuzzer;
diff --git a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc b/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
deleted file mode 100644
index d0fdaab3400..00000000000
--- a/test/core/transport/binder/end2end/fuzzers/server_fuzzer.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <grpc/grpc.h>
-
-#include "absl/log/check.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/iomgr/executor.h"
-#include "src/core/lib/slice/slice_internal.h"
-#include "src/core/server/server.h"
-#include "src/libfuzzer/libfuzzer_macro.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/end2end/fuzzers/binder_transport_fuzzer.pb.h"
-#include "test/core/transport/binder/end2end/fuzzers/fuzzer_utils.h"
-
-bool squelch = true;
-bool leak_check = true;
-
-static void* tag(intptr_t t) { return reinterpret_cast<void*>(t); }
-
-DEFINE_PROTO_FUZZER(const binder_transport_fuzzer::Input& input) {
-  if (squelch) {
-    grpc_disable_all_absl_logs();
-  }
-  grpc_init();
-  {
-    // Copied and modified from grpc/test/core/end2end/fuzzers/server_fuzzer.cc
-    grpc_core::ExecCtx exec_ctx;
-    grpc_core::Executor::SetThreadingAll(false);
-
-    grpc_server* server = grpc_server_create(nullptr, nullptr);
-    grpc_completion_queue* cq = grpc_completion_queue_create_for_next(nullptr);
-    grpc_server_register_completion_queue(server, cq, nullptr);
-    // TODO(ctiller): add more registered methods (one for POST, one for PUT)
-    grpc_server_register_method(server, "/reg", nullptr, {}, 0);
-    grpc_server_start(server);
-    grpc_core::Transport* server_transport =
-        grpc_create_binder_transport_server(
-            std::make_unique<grpc_binder::fuzzing::BinderForFuzzing>(
-                input.incoming_parcels()),
-            std::make_shared<
-                grpc::experimental::binder::UntrustedSecurityPolicy>());
-    grpc_core::ChannelArgs channel_args = grpc_core::CoreConfiguration::Get()
-                                              .channel_args_preconditioning()
-                                              .PreconditionChannelArgs(nullptr);
-    (void)grpc_core::Server::FromC(server)->SetupTransport(
-        server_transport, nullptr, channel_args, nullptr);
-    grpc_call* call1 = nullptr;
-    grpc_call_details call_details1;
-    grpc_metadata_array request_metadata1;
-    grpc_call_details_init(&call_details1);
-    grpc_metadata_array_init(&request_metadata1);
-    int requested_calls = 0;
-
-    CHECK(GRPC_CALL_OK ==
-          grpc_server_request_call(server, &call1, &call_details1,
-                                   &request_metadata1, cq, cq, tag(1)));
-    requested_calls++;
-
-    grpc_event ev;
-    while (true) {
-      grpc_core::ExecCtx::Get()->Flush();
-      ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME),
-                                      nullptr);
-      switch (ev.type) {
-        case GRPC_QUEUE_TIMEOUT:
-          goto done;
-        case GRPC_QUEUE_SHUTDOWN:
-          break;
-        case GRPC_OP_COMPLETE:
-          if (ev.tag == tag(1)) {
-            requested_calls--;
-            // TODO(ctiller): keep reading that call!
-          }
-          break;
-      }
-    }
-
-  done:
-    grpc_binder::fuzzing::JoinFuzzingThread();
-    if (call1 != nullptr) grpc_call_unref(call1);
-    grpc_call_details_destroy(&call_details1);
-    grpc_metadata_array_destroy(&request_metadata1);
-    grpc_server_shutdown_and_notify(server, cq, tag(0xdead));
-    grpc_server_cancel_all_calls(server);
-    grpc_core::Timestamp deadline =
-        grpc_core::Timestamp::Now() + grpc_core::Duration::Seconds(5);
-    for (int i = 0; i <= requested_calls; i++) {
-      // A single grpc_completion_queue_next might not be sufficient for getting
-      // the tag from shutdown, because we might potentially get blocked by
-      // an operation happening on the timer thread.
-      // For example, the deadline timer might expire, leading to the timer
-      // thread trying to cancel the RPC and thereby acquiring a few references
-      // to the call. This will prevent the shutdown to complete till the timer
-      // thread releases those references.
-      // As a solution, we are going to keep performing a cq_next for a
-      // liberal period of 5 seconds for the timer thread to complete its work.
-      do {
-        ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME),
-                                        nullptr);
-        grpc_core::ExecCtx::Get()->InvalidateNow();
-      } while (ev.type != GRPC_OP_COMPLETE &&
-               grpc_core::Timestamp::Now() < deadline);
-      CHECK(ev.type == GRPC_OP_COMPLETE);
-    }
-    grpc_completion_queue_shutdown(cq);
-    for (int i = 0; i <= requested_calls; i++) {
-      do {
-        ev = grpc_completion_queue_next(cq, gpr_inf_past(GPR_CLOCK_REALTIME),
-                                        nullptr);
-        grpc_core::ExecCtx::Get()->InvalidateNow();
-      } while (ev.type != GRPC_QUEUE_SHUTDOWN &&
-               grpc_core::Timestamp::Now() < deadline);
-      CHECK(ev.type == GRPC_QUEUE_SHUTDOWN);
-    }
-    grpc_server_destroy(server);
-    grpc_completion_queue_destroy(cq);
-  }
-  grpc_shutdown();
-}
diff --git a/test/core/transport/binder/end2end/testing_channel_create.cc b/test/core/transport/binder/end2end/testing_channel_create.cc
deleted file mode 100644
index 58a9a03006d..00000000000
--- a/test/core/transport/binder/end2end/testing_channel_create.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "test/core/transport/binder/end2end/testing_channel_create.h"
-
-#include <grpcpp/security/binder_security_policy.h>
-
-#include <utility>
-
-#include "absl/log/check.h"
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/surface/channel.h"
-#include "src/core/lib/surface/channel_create.h"
-#include "src/core/lib/transport/error_utils.h"
-
-namespace grpc_binder {
-namespace end2end_testing {
-
-namespace {
-// Since we assume the first half of the transport setup is completed before the
-// server side enters WireReader::SetupTransport, we need this helper to wait
-// and finish that part of the negotiation for us.
-class ServerSetupTransportHelper {
- public:
-  ServerSetupTransportHelper()
-      : wire_reader_(std::make_unique<WireReaderImpl>(
-            /*transport_stream_receiver=*/nullptr, /*is_client=*/false,
-            std::make_shared<
-                grpc::experimental::binder::UntrustedSecurityPolicy>())) {
-    std::tie(endpoint_binder_, tx_receiver_) = NewBinderPair(
-        [this](transaction_code_t tx_code, ReadableParcel* parcel, int uid) {
-          return this->wire_reader_->ProcessTransaction(tx_code, parcel, uid);
-        });
-  }
-  std::unique_ptr<Binder> WaitForClientBinder() {
-    return wire_reader_->RecvSetupTransport();
-  }
-
-  std::unique_ptr<Binder> GetEndpointBinderForClient() {
-    return std::move(endpoint_binder_);
-  }
-
- private:
-  std::unique_ptr<WireReaderImpl> wire_reader_;
-  // The endpoint binder for client.
-  std::unique_ptr<Binder> endpoint_binder_;
-  std::unique_ptr<TransactionReceiver> tx_receiver_;
-};
-}  // namespace
-
-std::pair<grpc_core::Transport*, grpc_core::Transport*>
-CreateClientServerBindersPairForTesting() {
-  ServerSetupTransportHelper helper;
-  std::unique_ptr<Binder> endpoint_binder = helper.GetEndpointBinderForClient();
-  grpc_core::Transport* client_transport = nullptr;
-
-  struct ThreadArgs {
-    std::unique_ptr<Binder> endpoint_binder;
-    grpc_core::Transport** client_transport;
-  } args;
-
-  args.endpoint_binder = std::move(endpoint_binder);
-  args.client_transport = &client_transport;
-
-  grpc_core::Thread client_thread(
-      "client-thread",
-      [](void* arg) {
-        ThreadArgs* args = static_cast<ThreadArgs*>(arg);
-        std::unique_ptr<Binder> endpoint_binder =
-            std::move(args->endpoint_binder);
-        *args->client_transport = grpc_create_binder_transport_client(
-            std::move(endpoint_binder),
-            std::make_shared<
-                grpc::experimental::binder::UntrustedSecurityPolicy>());
-      },
-      &args);
-  client_thread.Start();
-  grpc_core::Transport* server_transport = grpc_create_binder_transport_server(
-      helper.WaitForClientBinder(),
-      std::make_shared<grpc::experimental::binder::UntrustedSecurityPolicy>());
-  client_thread.Join();
-  return std::make_pair(client_transport, server_transport);
-}
-
-std::shared_ptr<grpc::Channel> BinderChannelForTesting(
-    grpc::Server* server, const grpc::ChannelArguments& args) {
-  grpc_channel_args channel_args = args.c_channel_args();
-  return grpc::CreateChannelInternal(
-      "",
-      grpc_binder_channel_create_for_testing(server->c_server(), &channel_args,
-                                             nullptr),
-      std::vector<std::unique_ptr<
-          grpc::experimental::ClientInterceptorFactoryInterface>>());
-}
-
-}  // namespace end2end_testing
-}  // namespace grpc_binder
-
-grpc_channel* grpc_binder_channel_create_for_testing(
-    grpc_server* server, const grpc_channel_args* args, void* /*reserved*/) {
-  grpc_core::ExecCtx exec_ctx;
-
-  auto server_args = grpc_core::CoreConfiguration::Get()
-                         .channel_args_preconditioning()
-                         .PreconditionChannelArgs(args);
-  auto client_args =
-      server_args.Set(GRPC_ARG_DEFAULT_AUTHORITY, "test.authority");
-
-  grpc_core::Transport *client_transport, *server_transport;
-  std::tie(client_transport, server_transport) =
-      grpc_binder::end2end_testing::CreateClientServerBindersPairForTesting();
-  grpc_error_handle error = grpc_core::Server::FromC(server)->SetupTransport(
-      server_transport, nullptr, server_args, nullptr);
-  CHECK_OK(error);
-  auto channel = grpc_core::ChannelCreate(
-      "binder", client_args, GRPC_CLIENT_DIRECT_CHANNEL, client_transport);
-  CHECK_OK(channel);
-  return channel->release()->c_ptr();
-}
diff --git a/test/core/transport/binder/end2end/testing_channel_create.h b/test/core/transport/binder/end2end/testing_channel_create.h
deleted file mode 100644
index 2efe71365fe..00000000000
--- a/test/core/transport/binder/end2end/testing_channel_create.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H
-#define GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H
-
-#include <grpcpp/grpcpp.h>
-
-#include <utility>
-
-#include "src/core/ext/transport/binder/transport/binder_transport.h"
-#include "src/core/server/server.h"
-#include "test/core/transport/binder/end2end/fake_binder.h"
-
-namespace grpc_binder {
-namespace end2end_testing {
-
-std::pair<grpc_core::Transport*, grpc_core::Transport*>
-CreateClientServerBindersPairForTesting();
-
-std::shared_ptr<grpc::Channel> BinderChannelForTesting(
-    grpc::Server* server, const grpc::ChannelArguments& args);
-
-}  // namespace end2end_testing
-}  // namespace grpc_binder
-
-grpc_channel* grpc_binder_channel_create_for_testing(
-    grpc_server* server, const grpc_channel_args* args, void* /*reserved*/);
-
-#endif  // GRPC_TEST_CORE_TRANSPORT_BINDER_END2END_TESTING_CHANNEL_CREATE_H
diff --git a/test/core/transport/binder/endpoint_binder_pool_test.cc b/test/core/transport/binder/endpoint_binder_pool_test.cc
deleted file mode 100644
index 5086a2ea18c..00000000000
--- a/test/core/transport/binder/endpoint_binder_pool_test.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/client/endpoint_binder_pool.h"
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <cassert>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/memory/memory.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/mock_objects.h"
-
-namespace grpc_binder {
-
-class CallbackChecker {
- public:
-  MOCK_METHOD(void, Cb, (std::unique_ptr<grpc_binder::Binder>), ());
-};
-
-TEST(EndpointBinderPoolTest, AddBeforeGet) {
-  EndpointBinderPool pool;
-  auto b = std::make_unique<grpc_binder::MockBinder>();
-  CallbackChecker cc;
-  pool.AddEndpointBinder("test", std::move(b));
-  // TODO(mingcl): Use pointer matcher to verify it is `b` being passed back
-  // here. It is only available in newer gtest version
-  EXPECT_CALL(cc, Cb(testing::_));
-  pool.GetEndpointBinder(
-      "test", std::bind(&CallbackChecker::Cb, &cc, std::placeholders::_1));
-}
-
-TEST(EndpointBinderPoolTest, GetBeforeAdd) {
-  EndpointBinderPool pool;
-  auto b = std::make_unique<grpc_binder::MockBinder>();
-  CallbackChecker cc;
-  EXPECT_CALL(cc, Cb(testing::_)).Times(0);
-  pool.GetEndpointBinder(
-      "test", std::bind(&CallbackChecker::Cb, &cc, std::placeholders::_1));
-  EXPECT_CALL(cc, Cb(testing::_)).Times(1);
-  pool.AddEndpointBinder("test", std::move(b));
-}
-
-TEST(EndpointBinderPoolTest, ExpectNotCalled) {
-  EndpointBinderPool pool;
-  auto b = std::make_unique<grpc_binder::MockBinder>();
-  CallbackChecker cc;
-  EXPECT_CALL(cc, Cb(testing::_)).Times(0);
-  pool.GetEndpointBinder(
-      "test", std::bind(&CallbackChecker::Cb, &cc, std::placeholders::_1));
-}
-
-}  // namespace grpc_binder
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/binder/mock_objects.cc b/test/core/transport/binder/mock_objects.cc
deleted file mode 100644
index 7e173ef15ad..00000000000
--- a/test/core/transport/binder/mock_objects.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "test/core/transport/binder/mock_objects.h"
-
-#include <memory>
-
-#include "absl/memory/memory.h"
-
-namespace grpc_binder {
-
-using ::testing::Return;
-
-MockReadableParcel::MockReadableParcel() {
-  ON_CALL(*this, ReadBinder).WillByDefault([](std::unique_ptr<Binder>* binder) {
-    *binder = std::make_unique<MockBinder>();
-    return absl::OkStatus();
-  });
-  ON_CALL(*this, ReadInt32).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, ReadByteArray).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, ReadString).WillByDefault(Return(absl::OkStatus()));
-}
-
-MockWritableParcel::MockWritableParcel() {
-  ON_CALL(*this, WriteInt32).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, WriteBinder).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, WriteString).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, WriteByteArray).WillByDefault(Return(absl::OkStatus()));
-}
-
-MockBinder::MockBinder() {
-  ON_CALL(*this, PrepareTransaction).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, Transact).WillByDefault(Return(absl::OkStatus()));
-  ON_CALL(*this, GetWritableParcel).WillByDefault(Return(&mock_input_));
-  ON_CALL(*this, ConstructTxReceiver)
-      .WillByDefault(
-          [this](grpc_core::RefCountedPtr<WireReader> /*wire_reader_ref*/,
-                 TransactionReceiver::OnTransactCb cb) {
-            return std::make_unique<MockTransactionReceiver>(
-                cb, BinderTransportTxCode::SETUP_TRANSPORT, &mock_output_);
-          });
-}
-
-}  // namespace grpc_binder
diff --git a/test/core/transport/binder/mock_objects.h b/test/core/transport/binder/mock_objects.h
deleted file mode 100644
index 6424a2acd22..00000000000
--- a/test/core/transport/binder/mock_objects.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
-#define GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
-
-#include <gmock/gmock.h>
-
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver.h"
-#include "src/core/ext/transport/binder/wire_format/binder.h"
-#include "src/core/ext/transport/binder/wire_format/binder_constants.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader.h"
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-
-namespace grpc_binder {
-
-class MockWritableParcel : public WritableParcel {
- public:
-  MOCK_METHOD(int32_t, GetDataSize, (), (const, override));
-  MOCK_METHOD(absl::Status, WriteInt32, (int32_t), (override));
-  MOCK_METHOD(absl::Status, WriteInt64, (int64_t), (override));
-  MOCK_METHOD(absl::Status, WriteBinder, (HasRawBinder*), (override));
-  MOCK_METHOD(absl::Status, WriteString, (absl::string_view), (override));
-  MOCK_METHOD(absl::Status, WriteByteArray, (const int8_t*, int32_t),
-              (override));
-
-  MockWritableParcel();
-};
-
-class MockReadableParcel : public ReadableParcel {
- public:
-  MOCK_METHOD(int32_t, GetDataSize, (), (const, override));
-  MOCK_METHOD(absl::Status, ReadInt32, (int32_t*), (override));
-  MOCK_METHOD(absl::Status, ReadInt64, (int64_t*), (override));
-  MOCK_METHOD(absl::Status, ReadBinder, (std::unique_ptr<Binder>*), (override));
-  MOCK_METHOD(absl::Status, ReadByteArray, (std::string*), (override));
-  MOCK_METHOD(absl::Status, ReadString, (std::string*), (override));
-
-  MockReadableParcel();
-};
-
-class MockBinder : public Binder {
- public:
-  MOCK_METHOD(void, Initialize, (), (override));
-  MOCK_METHOD(absl::Status, PrepareTransaction, (), (override));
-  MOCK_METHOD(absl::Status, Transact, (BinderTransportTxCode), (override));
-  MOCK_METHOD(WritableParcel*, GetWritableParcel, (), (const, override));
-  MOCK_METHOD(std::unique_ptr<TransactionReceiver>, ConstructTxReceiver,
-              (grpc_core::RefCountedPtr<WireReader>,
-               TransactionReceiver::OnTransactCb),
-              (const, override));
-  MOCK_METHOD(void*, GetRawBinder, (), (override));
-
-  MockBinder();
-  MockWritableParcel& GetWriter() { return mock_input_; }
-  MockReadableParcel& GetReader() { return mock_output_; }
-
- private:
-  MockWritableParcel mock_input_;
-  MockReadableParcel mock_output_;
-};
-
-// TODO(waynetu): Implement transaction injection later for more thorough
-// testing.
-class MockTransactionReceiver : public TransactionReceiver {
- public:
-  explicit MockTransactionReceiver(OnTransactCb transact_cb,
-                                   BinderTransportTxCode code,
-                                   MockReadableParcel* output) {
-    if (code == BinderTransportTxCode::SETUP_TRANSPORT) {
-      EXPECT_CALL(*output, ReadInt32).WillOnce([](int32_t* version) {
-        *version = 1;
-        return absl::OkStatus();
-      });
-    }
-    transact_cb(static_cast<transaction_code_t>(code), output, /*uid=*/0)
-        .IgnoreError();
-  }
-
-  MOCK_METHOD(void*, GetRawBinder, (), (override));
-};
-
-class MockWireWriter : public WireWriter {
- public:
-  MOCK_METHOD(absl::Status, RpcCall, (std::unique_ptr<Transaction>),
-              (override));
-  MOCK_METHOD(absl::Status, SendAck, (int64_t), (override));
-  MOCK_METHOD(void, OnAckReceived, (int64_t), (override));
-};
-
-class MockTransportStreamReceiver : public TransportStreamReceiver {
- public:
-  MOCK_METHOD(void, RegisterRecvInitialMetadata,
-              (StreamIdentifier, InitialMetadataCallbackType), (override));
-  MOCK_METHOD(void, RegisterRecvMessage,
-              (StreamIdentifier, MessageDataCallbackType), (override));
-  MOCK_METHOD(void, RegisterRecvTrailingMetadata,
-              (StreamIdentifier, TrailingMetadataCallbackType), (override));
-  MOCK_METHOD(void, NotifyRecvInitialMetadata,
-              (StreamIdentifier, absl::StatusOr<Metadata>), (override));
-  MOCK_METHOD(void, NotifyRecvMessage,
-              (StreamIdentifier, absl::StatusOr<std::string>), (override));
-  MOCK_METHOD(void, NotifyRecvTrailingMetadata,
-              (StreamIdentifier, absl::StatusOr<Metadata>, int), (override));
-  MOCK_METHOD(void, CancelStream, (StreamIdentifier), (override));
-};
-
-}  // namespace grpc_binder
-
-#endif  // GRPC_TEST_CORE_TRANSPORT_BINDER_MOCK_OBJECTS_H
diff --git a/test/core/transport/binder/transport_stream_receiver_test.cc b/test/core/transport/binder/transport_stream_receiver_test.cc
deleted file mode 100644
index 86ead7f5c17..00000000000
--- a/test/core/transport/binder/transport_stream_receiver_test.cc
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include <cassert>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "absl/memory/memory.h"
-#include "src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h"
-#include "test/core/test_util/test_config.h"
-
-namespace grpc_binder {
-namespace {
-
-// TODO(waynetu): These are hacks to make callbacks aware of their stream IDs
-// and sequence numbers. Remove/Refactor these hacks when possible.
-template <typename T>
-std::pair<StreamIdentifier, int> Decode(const T& /*data*/) {
-  assert(false && "This should not be called");
-  return {};
-}
-
-template <>
-std::pair<StreamIdentifier, int> Decode<std::string>(const std::string& data) {
-  assert(data.size() == sizeof(StreamIdentifier) + sizeof(int));
-  StreamIdentifier id{};
-  int seq_num{};
-  std::memcpy(&id, data.data(), sizeof(StreamIdentifier));
-  std::memcpy(&seq_num, data.data() + sizeof(StreamIdentifier), sizeof(int));
-  return std::make_pair(id, seq_num);
-}
-
-template <>
-std::pair<StreamIdentifier, int> Decode<Metadata>(const Metadata& data) {
-  assert(data.size() == 1);
-  const std::string& encoding = data[0].first;
-  return Decode(encoding);
-}
-
-template <typename T>
-T Encode(StreamIdentifier /*id*/, int /*seq_num*/) {
-  assert(false && "This should not be called");
-  return {};
-}
-
-template <>
-std::string Encode<std::string>(StreamIdentifier id, int seq_num) {
-  char result[sizeof(StreamIdentifier) + sizeof(int)];
-  std::memcpy(result, &id, sizeof(StreamIdentifier));
-  std::memcpy(result + sizeof(StreamIdentifier), &seq_num, sizeof(int));
-  return std::string(result, sizeof(StreamIdentifier) + sizeof(int));
-}
-
-template <>
-Metadata Encode<Metadata>(StreamIdentifier id, int seq_num) {
-  return {{Encode<std::string>(id, seq_num), ""}};
-}
-
-MATCHER_P2(StreamIdAndSeqNumMatch, id, seq_num, "") {
-  auto p = Decode(arg.value());
-  return p.first == id && p.second == seq_num;
-}
-
-// MockCallback is used to verify the every callback passed to transaction
-// receiver will eventually be invoked with the artifact of its corresponding
-// binder transaction.
-template <typename FirstArg, typename... TrailingArgs>
-class MockCallback {
- public:
-  explicit MockCallback(StreamIdentifier id, int seq_num)
-      : id_(id), seq_num_(seq_num) {}
-
-  MOCK_METHOD(void, ActualCallback, (FirstArg), ());
-
-  std::function<void(FirstArg, TrailingArgs...)> GetHandle() {
-    return [this](FirstArg first_arg, TrailingArgs...) {
-      this->ActualCallback(first_arg);
-    };
-  }
-
-  void ExpectCallbackInvocation() {
-    EXPECT_CALL(*this, ActualCallback(StreamIdAndSeqNumMatch(id_, seq_num_)));
-  }
-
- private:
-  StreamIdentifier id_;
-  int seq_num_;
-};
-
-using MockInitialMetadataCallback = MockCallback<absl::StatusOr<Metadata>>;
-using MockMessageCallback = MockCallback<absl::StatusOr<std::string>>;
-using MockTrailingMetadataCallback =
-    MockCallback<absl::StatusOr<Metadata>, int>;
-
-class MockOpBatch {
- public:
-  MockOpBatch(StreamIdentifier id, int flag, int seq_num)
-      : id_(id), flag_(flag), seq_num_(seq_num) {
-    if (flag_ & kFlagPrefix) {
-      initial_metadata_callback_ =
-          std::make_unique<MockInitialMetadataCallback>(id_, seq_num_);
-    }
-    if (flag_ & kFlagMessageData) {
-      message_callback_ = std::make_unique<MockMessageCallback>(id_, seq_num_);
-    }
-    if (flag_ & kFlagSuffix) {
-      trailing_metadata_callback_ =
-          std::make_unique<MockTrailingMetadataCallback>(id_, seq_num_);
-    }
-  }
-
-  void Complete(TransportStreamReceiver& receiver) {
-    if (flag_ & kFlagPrefix) {
-      initial_metadata_callback_->ExpectCallbackInvocation();
-      receiver.NotifyRecvInitialMetadata(id_, Encode<Metadata>(id_, seq_num_));
-    }
-    if (flag_ & kFlagMessageData) {
-      message_callback_->ExpectCallbackInvocation();
-      receiver.NotifyRecvMessage(id_, Encode<std::string>(id_, seq_num_));
-    }
-    if (flag_ & kFlagSuffix) {
-      trailing_metadata_callback_->ExpectCallbackInvocation();
-      receiver.NotifyRecvTrailingMetadata(id_, Encode<Metadata>(id_, seq_num_),
-                                          0);
-    }
-  }
-
-  void RequestRecv(TransportStreamReceiver& receiver) {
-    if (flag_ & kFlagPrefix) {
-      receiver.RegisterRecvInitialMetadata(
-          id_, initial_metadata_callback_->GetHandle());
-    }
-    if (flag_ & kFlagMessageData) {
-      receiver.RegisterRecvMessage(id_, message_callback_->GetHandle());
-    }
-    if (flag_ & kFlagSuffix) {
-      receiver.RegisterRecvTrailingMetadata(
-          id_, trailing_metadata_callback_->GetHandle());
-    }
-  }
-
-  MockOpBatch NextBatch(int flag) const {
-    return MockOpBatch(id_, flag, seq_num_ + 1);
-  }
-
- private:
-  std::unique_ptr<MockInitialMetadataCallback> initial_metadata_callback_;
-  std::unique_ptr<MockMessageCallback> message_callback_;
-  std::unique_ptr<MockTrailingMetadataCallback> trailing_metadata_callback_;
-  int id_, flag_, seq_num_;
-};
-
-class TransportStreamReceiverTest : public ::testing::Test {
- protected:
-  MockOpBatch NewGrpcStream(int flag) {
-    return MockOpBatch(current_id_++, flag, 0);
-  }
-
-  StreamIdentifier current_id_ = 0;
-};
-
-const int kFlagAll = kFlagPrefix | kFlagMessageData | kFlagSuffix;
-
-}  // namespace
-
-TEST_F(TransportStreamReceiverTest, MultipleStreamRequestThenComplete) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagAll);
-  t0.RequestRecv(receiver);
-  t0.Complete(receiver);
-}
-
-TEST_F(TransportStreamReceiverTest, MultipleStreamCompleteThenRequest) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagAll);
-  t0.Complete(receiver);
-  t0.RequestRecv(receiver);
-}
-
-TEST_F(TransportStreamReceiverTest, MultipleStreamInterleaved) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagAll);
-  MockOpBatch t1 = NewGrpcStream(kFlagAll);
-  t1.Complete(receiver);
-  t0.Complete(receiver);
-  t0.RequestRecv(receiver);
-  t1.RequestRecv(receiver);
-}
-
-TEST_F(TransportStreamReceiverTest, MultipleStreamInterleavedReversed) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagAll);
-  MockOpBatch t1 = NewGrpcStream(kFlagAll);
-  t0.RequestRecv(receiver);
-  t1.RequestRecv(receiver);
-  t1.Complete(receiver);
-  t0.Complete(receiver);
-}
-
-TEST_F(TransportStreamReceiverTest, MultipleStreamMoreInterleaved) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagAll);
-  MockOpBatch t1 = NewGrpcStream(kFlagAll);
-  t0.RequestRecv(receiver);
-  t1.Complete(receiver);
-  MockOpBatch t2 = NewGrpcStream(kFlagAll);
-  t2.RequestRecv(receiver);
-  t0.Complete(receiver);
-  t1.RequestRecv(receiver);
-  t2.Complete(receiver);
-}
-
-TEST_F(TransportStreamReceiverTest, SingleStreamUnaryCall) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagPrefix);
-  MockOpBatch t1 = t0.NextBatch(kFlagMessageData);
-  MockOpBatch t2 = t1.NextBatch(kFlagSuffix);
-  t0.RequestRecv(receiver);
-  t1.RequestRecv(receiver);
-  t2.RequestRecv(receiver);
-  t0.Complete(receiver);
-  t1.Complete(receiver);
-  t2.Complete(receiver);
-}
-
-TEST_F(TransportStreamReceiverTest, SingleStreamStreamingCall) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagPrefix);
-  t0.RequestRecv(receiver);
-  t0.Complete(receiver);
-  MockOpBatch t1 = t0.NextBatch(kFlagMessageData);
-  t1.Complete(receiver);
-  t1.RequestRecv(receiver);
-  MockOpBatch t2 = t1.NextBatch(kFlagMessageData);
-  t2.RequestRecv(receiver);
-  t2.Complete(receiver);
-  MockOpBatch t3 = t2.NextBatch(kFlagMessageData);
-  MockOpBatch t4 = t3.NextBatch(kFlagMessageData);
-  t3.Complete(receiver);
-  t4.Complete(receiver);
-  t3.RequestRecv(receiver);
-  t4.RequestRecv(receiver);
-}
-
-TEST_F(TransportStreamReceiverTest, DISABLED_SingleStreamBufferedCallbacks) {
-  TransportStreamReceiverImpl receiver(/*is_client=*/true);
-  MockOpBatch t0 = NewGrpcStream(kFlagPrefix);
-  MockOpBatch t1 = t0.NextBatch(kFlagMessageData);
-  MockOpBatch t2 = t1.NextBatch(kFlagMessageData);
-  MockOpBatch t3 = t2.NextBatch(kFlagSuffix);
-  t0.RequestRecv(receiver);
-  // TODO(waynetu): Can gRPC issues recv_message before it actually receives the
-  // previous one?
-  t1.RequestRecv(receiver);
-  t2.RequestRecv(receiver);
-  t3.RequestRecv(receiver);
-  t0.Complete(receiver);
-  t1.Complete(receiver);
-  t2.Complete(receiver);
-  t3.Complete(receiver);
-}
-
-// TODO(waynetu): Should we have some concurrent stress tests to make sure that
-// thread safety is well taken care of?
-
-}  // namespace grpc_binder
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/binder/wire_reader_test.cc b/test/core/transport/binder/wire_reader_test.cc
deleted file mode 100644
index bdfeaa98e8b..00000000000
--- a/test/core/transport/binder/wire_reader_test.cc
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Unit tests for WireReaderImpl.
-//
-// WireReaderImpl is responsible for turning incoming transactions into
-// top-level metadata. The following tests verify that the interactions between
-// WireReaderImpl and both the output (readable) parcel and the transport stream
-// receiver are correct in all possible situations.
-
-#include <grpc/grpc.h>
-#include <grpcpp/security/binder_security_policy.h>
-#include <gtest/gtest.h>
-
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-
-#include "absl/memory/memory.h"
-#include "src/core/ext/transport/binder/wire_format/wire_reader_impl.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/mock_objects.h"
-
-namespace grpc_binder {
-
-using ::testing::DoAll;
-using ::testing::Return;
-using ::testing::SetArgPointee;
-using ::testing::StrictMock;
-
-namespace {
-
-class WireReaderTest : public ::testing::Test {
- protected:
-  void SetUp() override { SetUp(true); }
-  void SetUp(bool is_client) {
-    transport_stream_receiver_ =
-        std::make_shared<StrictMock<MockTransportStreamReceiver>>();
-    wire_reader_ = std::make_shared<WireReaderImpl>(
-        transport_stream_receiver_, is_client,
-        std::make_shared<
-            grpc::experimental::binder::UntrustedSecurityPolicy>());
-  }
-
-  void ExpectReadInt32(int result) {
-    EXPECT_CALL(mock_readable_parcel_, ReadInt32)
-        .WillOnce(DoAll(SetArgPointee<0>(result), Return(absl::OkStatus())));
-  }
-
-  void ExpectReadByteArray(const std::string& buffer) {
-    ExpectReadInt32(buffer.length());
-    if (!buffer.empty()) {
-      EXPECT_CALL(mock_readable_parcel_, ReadByteArray)
-          .WillOnce([buffer](std::string* data) {
-            *data = buffer;
-            return absl::OkStatus();
-          });
-    }
-  }
-
-  void ExpectReadString(const std::string& str) {
-    EXPECT_CALL(mock_readable_parcel_, ReadString)
-        .WillOnce([str](std::string* out) {
-          *out = str;
-          return absl::OkStatus();
-        });
-  }
-
-  void UnblockSetupTransport() {
-    // SETUP_TRANSPORT should finish before we can proceed with any other
-    // requests and streaming calls. The MockBinder will construct a
-    // MockTransactionReceiver, which will then sends SETUP_TRANSPORT request
-    // back to us.
-    wire_reader_->SetupTransport(std::make_unique<MockBinder>());
-  }
-
-  template <typename T>
-  absl::Status CallProcessTransaction(T tx_code) {
-    return wire_reader_->ProcessTransaction(
-        static_cast<transaction_code_t>(tx_code), &mock_readable_parcel_,
-        /*uid=*/0);
-  }
-
-  std::shared_ptr<StrictMock<MockTransportStreamReceiver>>
-      transport_stream_receiver_;
-  std::shared_ptr<WireReaderImpl> wire_reader_;
-  MockReadableParcel mock_readable_parcel_;
-};
-
-MATCHER_P(StatusOrStrEq, target, "") {
-  if (!arg.ok()) return false;
-  return arg.value() == target;
-}
-
-MATCHER_P(StatusOrContainerEq, target, "") {
-  if (!arg.ok()) return false;
-  return arg.value() == target;
-}
-
-}  // namespace
-
-TEST_F(WireReaderTest, SetupTransport) {
-  auto mock_binder = std::make_unique<MockBinder>();
-  MockBinder& mock_binder_ref = *mock_binder;
-
-  ::testing::InSequence sequence;
-  EXPECT_CALL(mock_binder_ref, Initialize);
-  EXPECT_CALL(mock_binder_ref, PrepareTransaction);
-  const MockReadableParcel mock_readable_parcel;
-  EXPECT_CALL(mock_binder_ref, GetWritableParcel);
-
-  // Write version.
-  EXPECT_CALL(mock_binder_ref.GetWriter(), WriteInt32(1));
-
-  wire_reader_->SetupTransport(std::move(mock_binder));
-}
-
-TEST_F(WireReaderTest, ProcessTransactionControlMessageSetupTransport) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-}
-
-TEST_F(WireReaderTest, ProcessTransactionControlMessagePingResponse) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-  EXPECT_CALL(mock_readable_parcel_, ReadInt32);
-  EXPECT_TRUE(
-      CallProcessTransaction(BinderTransportTxCode::PING_RESPONSE).ok());
-}
-
-TEST_F(WireReaderTest, ProcessTransactionServerRpcDataEmptyFlagIgnored) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // first transaction: empty flag
-  ExpectReadInt32(0);
-  // Won't further read sequence number.
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest,
-       ProcessTransactionServerRpcDataFlagPrefixWithoutMetadata) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // flag
-  ExpectReadInt32(kFlagPrefix);
-  // sequence number
-  ExpectReadInt32(0);
-
-  // count
-  ExpectReadInt32(0);
-  EXPECT_CALL(
-      *transport_stream_receiver_,
-      NotifyRecvInitialMetadata(kFirstCallId, StatusOrContainerEq(Metadata{})));
-
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest, ProcessTransactionServerRpcDataFlagPrefixWithMetadata) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // flag
-  ExpectReadInt32(kFlagPrefix);
-  // sequence number
-  ExpectReadInt32(0);
-
-  const std::vector<std::pair<std::string, std::string>> kMetadata = {
-      {"", ""},
-      {"", "value"},
-      {"key", ""},
-      {"key", "value"},
-      {"another-key", "another-value"},
-  };
-
-  // count
-  ExpectReadInt32(kMetadata.size());
-  for (const auto& md : kMetadata) {
-    // metadata key
-    ExpectReadByteArray(md.first);
-    // metadata val
-    // TODO(waynetu): metadata value can also be "parcelable".
-    ExpectReadByteArray(md.second);
-  }
-  EXPECT_CALL(
-      *transport_stream_receiver_,
-      NotifyRecvInitialMetadata(kFirstCallId, StatusOrContainerEq(kMetadata)));
-
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest, ProcessTransactionServerRpcDataFlagMessageDataNonEmpty) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // flag
-  ExpectReadInt32(kFlagMessageData);
-  // sequence number
-  ExpectReadInt32(0);
-
-  // message data
-  // TODO(waynetu): message data can also be "parcelable".
-  const std::string kMessageData = "message data";
-  ExpectReadByteArray(kMessageData);
-  EXPECT_CALL(*transport_stream_receiver_,
-              NotifyRecvMessage(kFirstCallId, StatusOrStrEq(kMessageData)));
-
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest, ProcessTransactionServerRpcDataFlagMessageDataEmpty) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // flag
-  ExpectReadInt32(kFlagMessageData);
-  // sequence number
-  ExpectReadInt32(0);
-
-  // message data
-  // TODO(waynetu): message data can also be "parcelable".
-  const std::string kMessageData;
-  ExpectReadByteArray(kMessageData);
-  EXPECT_CALL(*transport_stream_receiver_,
-              NotifyRecvMessage(kFirstCallId, StatusOrStrEq(kMessageData)));
-
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest, ProcessTransactionServerRpcDataFlagSuffixWithStatus) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  constexpr int kStatus = 0x1234;
-  // flag
-  ExpectReadInt32(kFlagSuffix | kFlagStatusDescription | (kStatus << 16));
-  // sequence number
-  ExpectReadInt32(0);
-  // status description
-  EXPECT_CALL(mock_readable_parcel_, ReadString);
-  // metadata count
-  ExpectReadInt32(0);
-  EXPECT_CALL(*transport_stream_receiver_,
-              NotifyRecvTrailingMetadata(
-                  kFirstCallId, StatusOrContainerEq(Metadata{}), kStatus));
-
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest, ProcessTransactionServerRpcDataFlagSuffixWithoutStatus) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // flag
-  ExpectReadInt32(kFlagSuffix);
-  // sequence number
-  ExpectReadInt32(0);
-  // No status description
-  // metadata count
-  ExpectReadInt32(0);
-  EXPECT_CALL(*transport_stream_receiver_,
-              NotifyRecvTrailingMetadata(kFirstCallId,
-                                         StatusOrContainerEq(Metadata{}), 0));
-
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest, InBoundFlowControl) {
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // data size
-  EXPECT_CALL(mock_readable_parcel_, GetDataSize).WillOnce(Return(1000));
-  // flag
-  ExpectReadInt32(kFlagMessageData | kFlagMessageDataIsPartial);
-  // sequence number
-  ExpectReadInt32(0);
-  // message size
-  ExpectReadInt32(1000);
-  EXPECT_CALL(mock_readable_parcel_, ReadByteArray)
-      .WillOnce(DoAll(SetArgPointee<0>(std::string(1000, 'a')),
-                      Return(absl::OkStatus())));
-
-  // Data is not completed. No callback will be triggered.
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-
-  EXPECT_CALL(mock_readable_parcel_, GetDataSize).WillOnce(Return(1000));
-  // flag
-  ExpectReadInt32(kFlagMessageData);
-  // sequence number
-  ExpectReadInt32(1);
-  // message size
-  ExpectReadInt32(1000);
-  EXPECT_CALL(mock_readable_parcel_, ReadByteArray)
-      .WillOnce(DoAll(SetArgPointee<0>(std::string(1000, 'b')),
-                      Return(absl::OkStatus())));
-
-  EXPECT_CALL(*transport_stream_receiver_,
-              NotifyRecvMessage(kFirstCallId,
-                                StatusOrContainerEq(std::string(1000, 'a') +
-                                                    std::string(1000, 'b'))));
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-TEST_F(WireReaderTest, ServerInitialMetadata) {
-  SetUp(/*is_client=*/false);
-
-  ::testing::InSequence sequence;
-  UnblockSetupTransport();
-
-  // flag
-  ExpectReadInt32(kFlagPrefix);
-  // sequence number
-  ExpectReadInt32(0);
-
-  const std::vector<std::pair<std::string, std::string>> kMetadata = {
-      {"", ""},
-      {"", "value"},
-      {"key", ""},
-      {"key", "value"},
-      {"another-key", "another-value"},
-  };
-
-  // method ref
-  ExpectReadString("test.service/rpc.method");
-
-  // metadata
-  {
-    // count
-    ExpectReadInt32(kMetadata.size());
-    for (const auto& md : kMetadata) {
-      // metadata key
-      ExpectReadByteArray(md.first);
-      // metadata val
-      // TODO(waynetu): metadata value can also be "parcelable".
-      ExpectReadByteArray(md.second);
-    }
-  }
-
-  // Since path and authority is not encoded as metadata in wire format,
-  // wire_reader implementation should insert them as metadata before passing
-  // to transport layer.
-  auto metadata_expectation = kMetadata;
-  metadata_expectation.push_back({":path", "/test.service/rpc.method"});
-  metadata_expectation.push_back({":authority", "binder.authority"});
-
-  EXPECT_CALL(*transport_stream_receiver_,
-              NotifyRecvInitialMetadata(
-                  kFirstCallId, StatusOrContainerEq(metadata_expectation)));
-
-  EXPECT_TRUE(CallProcessTransaction(kFirstCallId).ok());
-}
-
-}  // namespace grpc_binder
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  grpc_init();
-  auto results = RUN_ALL_TESTS();
-  grpc_shutdown();
-  return results;
-}
diff --git a/test/core/transport/binder/wire_writer_test.cc b/test/core/transport/binder/wire_writer_test.cc
deleted file mode 100644
index 7dffe26d5ab..00000000000
--- a/test/core/transport/binder/wire_writer_test.cc
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "src/core/ext/transport/binder/wire_format/wire_writer.h"
-
-#include <grpcpp/impl/grpc_library.h>
-#include <gtest/gtest.h>
-
-#include <string>
-#include <utility>
-
-#include "absl/memory/memory.h"
-#include "test/core/test_util/test_config.h"
-#include "test/core/transport/binder/mock_objects.h"
-
-namespace grpc_binder {
-
-using ::testing::Return;
-
-MATCHER_P(StrEqInt8Ptr, target, "") {
-  return std::string(reinterpret_cast<const char*>(arg), target.size()) ==
-         target;
-}
-
-TEST(WireWriterTest, RpcCall) {
-  grpc::internal::GrpcLibrary init_lib;
-  // Required because wire writer uses combiner internally.
-  grpc_core::ExecCtx exec_ctx;
-  auto mock_binder = std::make_unique<MockBinder>();
-  MockBinder& mock_binder_ref = *mock_binder;
-  MockWritableParcel mock_writable_parcel;
-  ON_CALL(mock_binder_ref, GetWritableParcel)
-      .WillByDefault(Return(&mock_writable_parcel));
-  WireWriterImpl wire_writer(std::move(mock_binder));
-
-  auto ExpectWriteByteArray = [&](const std::string& target) {
-    // length
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(target.size()));
-    if (!target.empty()) {
-      // content
-      EXPECT_CALL(mock_writable_parcel,
-                  WriteByteArray(StrEqInt8Ptr(target), target.size()));
-    }
-  };
-
-  ::testing::InSequence sequence;
-  int sequence_number = 0;
-
-  {
-    // flag
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(0));
-    // sequence number
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(sequence_number));
-
-    EXPECT_CALL(mock_binder_ref, Transact(BinderTransportTxCode(kFirstCallId)));
-
-    auto tx = std::make_unique<Transaction>(kFirstCallId, /*is_client=*/true);
-    EXPECT_TRUE(wire_writer.RpcCall(std::move(tx)).ok());
-    sequence_number++;
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-  {
-    // flag
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(kFlagPrefix));
-    // sequence number. This is another stream so the sequence number starts
-    // with 0.
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(0));
-
-    EXPECT_CALL(mock_writable_parcel,
-                WriteString(absl::string_view("/example/method/ref")));
-
-    const std::vector<std::pair<std::string, std::string>> kMetadata = {
-        {"", ""},
-        {"", "value"},
-        {"key", ""},
-        {"key", "value"},
-        {"another-key", "another-value"},
-    };
-
-    // Number of metadata
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(kMetadata.size()));
-
-    for (const auto& md : kMetadata) {
-      ExpectWriteByteArray(md.first);
-      ExpectWriteByteArray(md.second);
-    }
-
-    EXPECT_CALL(mock_binder_ref,
-                Transact(BinderTransportTxCode(kFirstCallId + 1)));
-
-    auto tx =
-        std::make_unique<Transaction>(kFirstCallId + 1, /*is_client=*/true);
-    tx->SetPrefix(kMetadata);
-    tx->SetMethodRef("/example/method/ref");
-    EXPECT_TRUE(wire_writer.RpcCall(std::move(tx)).ok());
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-  {
-    // flag
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(kFlagMessageData));
-    // sequence number
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(sequence_number));
-
-    ExpectWriteByteArray("data");
-    EXPECT_CALL(mock_binder_ref, Transact(BinderTransportTxCode(kFirstCallId)));
-
-    auto tx = std::make_unique<Transaction>(kFirstCallId, /*is_client=*/true);
-    tx->SetData("data");
-    EXPECT_TRUE(wire_writer.RpcCall(std::move(tx)).ok());
-    sequence_number++;
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-  {
-    // flag
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(kFlagSuffix));
-    // sequence number
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(sequence_number));
-
-    EXPECT_CALL(mock_binder_ref, Transact(BinderTransportTxCode(kFirstCallId)));
-
-    auto tx = std::make_unique<Transaction>(kFirstCallId, /*is_client=*/true);
-    tx->SetSuffix({});
-    EXPECT_TRUE(wire_writer.RpcCall(std::move(tx)).ok());
-    sequence_number++;
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-  {
-    // flag
-    EXPECT_CALL(mock_writable_parcel,
-                WriteInt32(kFlagPrefix | kFlagMessageData | kFlagSuffix));
-    // sequence number
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(sequence_number));
-
-    EXPECT_CALL(mock_writable_parcel,
-                WriteString(absl::string_view("/example/method/ref")));
-
-    const std::vector<std::pair<std::string, std::string>> kMetadata = {
-        {"", ""},
-        {"", "value"},
-        {"key", ""},
-        {"key", "value"},
-        {"another-key", "another-value"},
-    };
-
-    // Number of metadata
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(kMetadata.size()));
-
-    for (const auto& md : kMetadata) {
-      ExpectWriteByteArray(md.first);
-      ExpectWriteByteArray(md.second);
-    }
-
-    // Empty message data
-    ExpectWriteByteArray("");
-
-    EXPECT_CALL(mock_binder_ref, Transact(BinderTransportTxCode(kFirstCallId)));
-
-    auto tx = std::make_unique<Transaction>(kFirstCallId, /*is_client=*/true);
-    // TODO(waynetu): Implement a helper function that automatically creates
-    // EXPECT_CALL based on the tx object.
-    tx->SetPrefix(kMetadata);
-    tx->SetMethodRef("/example/method/ref");
-    tx->SetData("");
-    tx->SetSuffix({});
-    EXPECT_TRUE(wire_writer.RpcCall(std::move(tx)).ok());
-    sequence_number++;
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-
-  // Really large message
-  {
-    EXPECT_CALL(mock_writable_parcel,
-                WriteInt32(kFlagMessageData | kFlagMessageDataIsPartial));
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(0));
-    ExpectWriteByteArray(std::string(WireWriterImpl::kBlockSize, 'a'));
-    EXPECT_CALL(mock_writable_parcel, GetDataSize)
-        .WillOnce(Return(WireWriterImpl::kBlockSize));
-    EXPECT_CALL(mock_binder_ref,
-                Transact(BinderTransportTxCode(kFirstCallId + 2)));
-
-    EXPECT_CALL(mock_writable_parcel,
-                WriteInt32(kFlagMessageData | kFlagMessageDataIsPartial));
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(1));
-    ExpectWriteByteArray(std::string(WireWriterImpl::kBlockSize, 'a'));
-    EXPECT_CALL(mock_writable_parcel, GetDataSize)
-        .WillOnce(Return(WireWriterImpl::kBlockSize));
-    EXPECT_CALL(mock_binder_ref,
-                Transact(BinderTransportTxCode(kFirstCallId + 2)));
-
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(kFlagMessageData));
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(2));
-    ExpectWriteByteArray("a");
-    EXPECT_CALL(mock_writable_parcel, GetDataSize).WillOnce(Return(1));
-    EXPECT_CALL(mock_binder_ref,
-                Transact(BinderTransportTxCode(kFirstCallId + 2)));
-
-    // Use a new stream.
-    auto tx =
-        std::make_unique<Transaction>(kFirstCallId + 2, /*is_client=*/true);
-    tx->SetData(std::string(2 * WireWriterImpl::kBlockSize + 1, 'a'));
-    EXPECT_TRUE(wire_writer.RpcCall(std::move(tx)).ok());
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-  // Really large message with metadata
-  {
-    EXPECT_CALL(
-        mock_writable_parcel,
-        WriteInt32(kFlagPrefix | kFlagMessageData | kFlagMessageDataIsPartial));
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(0));
-    EXPECT_CALL(mock_writable_parcel, WriteString(absl::string_view("123")));
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(0));
-    ExpectWriteByteArray(std::string(WireWriterImpl::kBlockSize, 'a'));
-    EXPECT_CALL(mock_writable_parcel, GetDataSize)
-        .WillOnce(Return(WireWriterImpl::kBlockSize));
-    EXPECT_CALL(mock_binder_ref,
-                Transact(BinderTransportTxCode(kFirstCallId + 3)));
-
-    EXPECT_CALL(mock_writable_parcel,
-                WriteInt32(kFlagMessageData | kFlagMessageDataIsPartial));
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(1));
-    ExpectWriteByteArray(std::string(WireWriterImpl::kBlockSize, 'a'));
-    EXPECT_CALL(mock_writable_parcel, GetDataSize)
-        .WillOnce(Return(WireWriterImpl::kBlockSize));
-    EXPECT_CALL(mock_binder_ref,
-                Transact(BinderTransportTxCode(kFirstCallId + 3)));
-
-    EXPECT_CALL(mock_writable_parcel,
-                WriteInt32(kFlagMessageData | kFlagSuffix));
-    EXPECT_CALL(mock_writable_parcel, WriteInt32(2));
-    ExpectWriteByteArray("a");
-    EXPECT_CALL(mock_writable_parcel, GetDataSize).WillOnce(Return(1));
-    EXPECT_CALL(mock_binder_ref,
-                Transact(BinderTransportTxCode(kFirstCallId + 3)));
-
-    // Use a new stream.
-    auto tx =
-        std::make_unique<Transaction>(kFirstCallId + 3, /*is_client=*/true);
-    tx->SetPrefix({});
-    tx->SetMethodRef("123");
-    tx->SetData(std::string(2 * WireWriterImpl::kBlockSize + 1, 'a'));
-    tx->SetSuffix({});
-    EXPECT_TRUE(wire_writer.RpcCall(std::move(tx)).ok());
-    grpc_core::ExecCtx::Get()->Flush();
-  }
-  grpc_core::ExecCtx::Get()->Flush();
-}
-
-}  // namespace grpc_binder
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  grpc::testing::TestEnvironment env(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 396a70209f2..e79c61376ab 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -960,7 +960,6 @@ include/grpcpp/channel.h \
 include/grpcpp/client_context.h \
 include/grpcpp/completion_queue.h \
 include/grpcpp/create_channel.h \
-include/grpcpp/create_channel_binder.h \
 include/grpcpp/create_channel_posix.h \
 include/grpcpp/ext/call_metric_recorder.h \
 include/grpcpp/ext/health_check_service_server_builder_option.h \
@@ -1052,8 +1051,6 @@ include/grpcpp/security/audit_logging.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/authorization_policy_provider.h \
-include/grpcpp/security/binder_credentials.h \
-include/grpcpp/security/binder_security_policy.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/tls_certificate_provider.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 5553d2c515d..b0981a0b293 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -960,7 +960,6 @@ include/grpcpp/channel.h \
 include/grpcpp/client_context.h \
 include/grpcpp/completion_queue.h \
 include/grpcpp/create_channel.h \
-include/grpcpp/create_channel_binder.h \
 include/grpcpp/create_channel_posix.h \
 include/grpcpp/ext/call_metric_recorder.h \
 include/grpcpp/ext/health_check_service_server_builder_option.h \
@@ -1052,8 +1051,6 @@ include/grpcpp/security/audit_logging.h \
 include/grpcpp/security/auth_context.h \
 include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/authorization_policy_provider.h \
-include/grpcpp/security/binder_credentials.h \
-include/grpcpp/security/binder_security_policy.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/tls_certificate_provider.h \
@@ -1173,44 +1170,6 @@ src/core/ext/filters/stateful_session/stateful_session_filter.cc \
 src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h \
-src/core/ext/transport/binder/client/binder_connector.cc \
-src/core/ext/transport/binder/client/binder_connector.h \
-src/core/ext/transport/binder/client/channel_create.cc \
-src/core/ext/transport/binder/client/channel_create_impl.cc \
-src/core/ext/transport/binder/client/channel_create_impl.h \
-src/core/ext/transport/binder/client/connection_id_generator.cc \
-src/core/ext/transport/binder/client/connection_id_generator.h \
-src/core/ext/transport/binder/client/endpoint_binder_pool.cc \
-src/core/ext/transport/binder/client/endpoint_binder_pool.h \
-src/core/ext/transport/binder/client/jni_utils.cc \
-src/core/ext/transport/binder/client/jni_utils.h \
-src/core/ext/transport/binder/client/security_policy_setting.cc \
-src/core/ext/transport/binder/client/security_policy_setting.h \
-src/core/ext/transport/binder/security_policy/binder_security_policy.cc \
-src/core/ext/transport/binder/server/binder_server.cc \
-src/core/ext/transport/binder/server/binder_server.h \
-src/core/ext/transport/binder/server/binder_server_credentials.cc \
-src/core/ext/transport/binder/transport/binder_stream.h \
-src/core/ext/transport/binder/transport/binder_transport.cc \
-src/core/ext/transport/binder/transport/binder_transport.h \
-src/core/ext/transport/binder/utils/binder_auto_utils.h \
-src/core/ext/transport/binder/utils/ndk_binder.cc \
-src/core/ext/transport/binder/utils/ndk_binder.h \
-src/core/ext/transport/binder/utils/transport_stream_receiver.h \
-src/core/ext/transport/binder/utils/transport_stream_receiver_impl.cc \
-src/core/ext/transport/binder/utils/transport_stream_receiver_impl.h \
-src/core/ext/transport/binder/wire_format/binder.h \
-src/core/ext/transport/binder/wire_format/binder_android.cc \
-src/core/ext/transport/binder/wire_format/binder_android.h \
-src/core/ext/transport/binder/wire_format/binder_constants.cc \
-src/core/ext/transport/binder/wire_format/binder_constants.h \
-src/core/ext/transport/binder/wire_format/transaction.cc \
-src/core/ext/transport/binder/wire_format/transaction.h \
-src/core/ext/transport/binder/wire_format/wire_reader.h \
-src/core/ext/transport/binder/wire_format/wire_reader_impl.cc \
-src/core/ext/transport/binder/wire_format/wire_reader_impl.h \
-src/core/ext/transport/binder/wire_format/wire_writer.cc \
-src/core/ext/transport/binder/wire_format/wire_writer.h \
 src/core/ext/transport/chttp2/alpn/alpn.cc \
 src/core/ext/transport/chttp2/alpn/alpn.h \
 src/core/ext/transport/chttp2/client/chttp2_connector.cc \
@@ -2716,7 +2675,6 @@ src/core/load_balancing/xds/xds_override_host.h \
 src/core/load_balancing/xds/xds_wrr_locality.cc \
 src/core/plugin_registry/grpc_plugin_registry.cc \
 src/core/plugin_registry/grpc_plugin_registry_extra.cc \
-src/core/resolver/binder/binder_resolver.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.h \
 src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 70acd1ce0dd..aa516cbb52a 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -975,7 +975,6 @@ src/core/ext/filters/stateful_session/stateful_session_filter.h \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.cc \
 src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h \
 src/core/ext/transport/README.md \
-src/core/ext/transport/binder/README.md \
 src/core/ext/transport/chttp2/README.md \
 src/core/ext/transport/chttp2/alpn/alpn.cc \
 src/core/ext/transport/chttp2/alpn/alpn.h \
@@ -2489,8 +2488,6 @@ src/core/load_balancing/xds/xds_wrr_locality.cc \
 src/core/plugin_registry/grpc_plugin_registry.cc \
 src/core/plugin_registry/grpc_plugin_registry_extra.cc \
 src/core/resolver/README.md \
-src/core/resolver/binder/README.md \
-src/core/resolver/binder/binder_resolver.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.cc \
 src/core/resolver/dns/c_ares/dns_resolver_ares.h \
 src/core/resolver/dns/c_ares/grpc_ares_ev_driver.h \
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 4252389b07a..5301d9c1084 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -1065,78 +1065,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "binder_resolver_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "binder_server_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "binder_transport_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -3147,30 +3075,6 @@
     ],
     "uses_polling": false
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "endpoint_binder_pool_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -3527,30 +3431,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "fake_binder_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -11395,30 +11275,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "transport_stream_receiver_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -11845,54 +11701,6 @@
     ],
     "uses_polling": false
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "wire_reader_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "wire_writer_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,